diff --git a/Gemfile b/Gemfile index b6541efc..dc9901ea 100644 --- a/Gemfile +++ b/Gemfile @@ -1,13 +1,13 @@ source "https://rubygems.org" source "https://rails-assets.org" -gem "rails", "~> 3.2.19" +gem "rails", "~> 3.2.21" # Rails app server gem "puma", "~> 2.9.0" # Error notification service (optional) -gem "rollbar", "~> 1.1.0", :require => false +gem "rollbar", "~> 1.2.9", :require => false # Environment specific configuration gem "dotenv-rails", "~> 1.0.1" diff --git a/Gemfile.lock b/Gemfile.lock index 0aebe858..737e4184 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,12 +27,12 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actionmailer (3.2.19) - actionpack (= 3.2.19) + actionmailer (3.2.21) + actionpack (= 3.2.21) mail (~> 2.5.4) - actionpack (3.2.19) - activemodel (= 3.2.19) - activesupport (= 3.2.19) + actionpack (3.2.21) + activemodel (= 3.2.21) + activesupport (= 3.2.21) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -42,18 +42,18 @@ GEM sprockets (~> 2.2.1) active_model_serializers (0.9.0) activemodel (>= 3.2) - activemodel (3.2.19) - activesupport (= 3.2.19) + activemodel (3.2.21) + activesupport (= 3.2.21) builder (~> 3.0.0) - activerecord (3.2.19) - activemodel (= 3.2.19) - activesupport (= 3.2.19) + activerecord (3.2.21) + activemodel (= 3.2.21) + activesupport (= 3.2.21) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.19) - activemodel (= 3.2.19) - activesupport (= 3.2.19) - activesupport (3.2.19) + activeresource (3.2.21) + activemodel (= 3.2.21) + activesupport (= 3.2.21) + activesupport (3.2.21) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.3.6) @@ -62,12 +62,12 @@ GEM astrolabe (1.3.0) parser (>= 2.2.0.pre.3, < 3.0) awesome_print (1.2.0) - barber (0.4.2) + barber (0.5.0) ember-source execjs - handlebars-source - bcrypt (3.1.7) - bcrypt (3.1.7-java) + handlebars-source (>= 1.0.0.rc.4) + bcrypt (3.1.9) + bcrypt (3.1.9-java) bootstrap-sass (2.3.2.2) sass (~> 3.2) builder (3.0.4) @@ -81,13 +81,13 @@ GEM capistrano-rails (1.1.2) capistrano (~> 3.1) capistrano-bundler (~> 1.1) - capybara (2.4.3) + capybara (2.4.4) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - chunky_png (1.3.1) + chunky_png (1.3.3) cliver (0.3.2) colorize (0.7.3) compass (0.12.7) @@ -99,12 +99,12 @@ GEM sprockets (<= 2.11.0) countries (0.9.3) currencies (~> 0.4.2) - coveralls (0.7.1) + coveralls (0.7.2) multi_json (~> 1.3) - rest-client + rest-client (= 1.6.7) simplecov (>= 0.7) - term-ansicolor - thor + term-ansicolor (= 1.2.2) + thor (= 0.18.1) css_parser (1.3.5) addressable csv_builder (2.1.1) @@ -117,7 +117,7 @@ GEM delayed_job_mongoid (2.1.0) delayed_job (>= 3.0, < 5) mongoid (>= 3.0, < 5) - devise (3.4.0) + devise (3.4.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -127,18 +127,18 @@ GEM diff-lcs (1.2.5) diffy (3.0.7) docile (1.1.5) - dotenv (1.0.1) - dotenv-rails (1.0.1) - dotenv (= 1.0.1) - elasticsearch (1.0.5) - elasticsearch-api (= 1.0.5) - elasticsearch-transport (= 1.0.5) - elasticsearch-api (1.0.5) + dotenv (1.0.2) + dotenv-rails (1.0.2) + dotenv (= 1.0.2) + elasticsearch (1.0.6) + elasticsearch-api (= 1.0.6) + elasticsearch-transport (= 1.0.6) + elasticsearch-api (1.0.6) multi_json - elasticsearch-transport (1.0.5) + elasticsearch-transport (1.0.6) faraday multi_json - ember-data-source (1.0.0.beta.10) + ember-data-source (1.0.0.beta.11) ember-source ember-rails (0.15.0) active_model_serializers @@ -152,7 +152,7 @@ GEM ember-source (1.7.0) handlebars-source (~> 1.0) erubis (2.7.0) - execjs (2.2.1) + execjs (2.2.2) factory_girl (4.4.0) activesupport (>= 3.0.0) factory_girl_rails (4.4.1) @@ -166,7 +166,7 @@ GEM hike (1.2.3) htmlentities (4.3.2) i18n (0.6.11) - jbuilder (2.2.2) + jbuilder (2.2.5) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) journey (1.0.4) @@ -187,7 +187,7 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) - mini_portile (0.6.0) + mini_portile (0.6.1) mongoid (3.1.6) activemodel (~> 3.2) moped (~> 1.4) @@ -213,10 +213,9 @@ GEM net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (2.9.1) - netrc (0.7.7) - nokogiri (1.6.3.1) - mini_portile (= 0.6.0) - nokogiri (1.6.3.1-java) + nokogiri (1.6.4.1) + mini_portile (~> 0.6.0) + nokogiri (1.6.4.1-java) oauth (0.4.7) oauth2 (1.0.0) faraday (>= 0.8, < 0.10) @@ -224,7 +223,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (~> 1.2) - oj (2.10.3) + oj (2.10.4) oj_mimic_json (1.0.1) omniauth (1.2.2) hashie (>= 1.2, < 4) @@ -238,7 +237,7 @@ GEM omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-google-oauth2 (0.2.5) + omniauth-google-oauth2 (0.2.6) omniauth (> 1.0) omniauth-oauth2 (~> 1.1) omniauth-oauth (1.0.1) @@ -258,7 +257,7 @@ GEM omniauth-oauth (~> 1.0) origin (1.1.0) orm_adapter (0.5.0) - parser (2.2.0.pre.5) + parser (2.2.0.pre.8) ast (>= 1.1, < 3.0) slop (~> 3.4, >= 3.4.5) poltergeist (1.5.1) @@ -275,40 +274,40 @@ GEM actionmailer (>= 3, < 5) premailer (~> 1.7, >= 1.7.9) psych (2.0.6) - puma (2.9.1) + puma (2.9.2) rack (>= 1.1, < 2.0) - puma (2.9.1-java) + puma (2.9.2-java) rack (>= 1.1, < 2.0) pundit (0.3.0) activesupport (>= 3.0.0) - rabl (0.11.0) + rabl (0.11.4) activesupport (>= 2.3.14) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-proxy (0.5.16) + rack-proxy (0.5.17) rack rack-ssl (1.3.4) rack rack-test (0.6.2) rack (>= 1.0) rack-timeout (0.0.4) - rails (3.2.19) - actionmailer (= 3.2.19) - actionpack (= 3.2.19) - activerecord (= 3.2.19) - activeresource (= 3.2.19) - activesupport (= 3.2.19) + rails (3.2.21) + actionmailer (= 3.2.21) + actionpack (= 3.2.21) + activerecord (= 3.2.21) + activeresource (= 3.2.21) + activesupport (= 3.2.21) bundler (~> 1.0) - railties (= 3.2.19) - rails-assets-ace-builds (1.1.7) + railties (= 3.2.21) + rails-assets-ace-builds (1.1.8) rails-assets-bootbox (3.3.0) - rails-assets-bootstrap-daterangepicker (1.3.13) + rails-assets-bootstrap-daterangepicker (1.3.16) rails-assets-jquery (>= 1.10) rails-assets-moment (~> 2.8.0) - rails-assets-datatables (1.10.2) + rails-assets-datatables (1.10.4) rails-assets-jquery (>= 1.7.0) - rails-assets-ember (1.7.0) + rails-assets-ember (1.8.1) rails-assets-handlebars (>= 1.0.0, < 2.0.0) rails-assets-jquery (>= 1.7.0, < 2.2.0) rails-assets-eventEmitter (4.2.9) @@ -316,7 +315,7 @@ GEM rails-assets-fontawesome (4.2.0) rails-assets-handlebars (1.3.0) rails-assets-html5shiv (3.7.2) - rails-assets-ic-ajax (2.0.1) + rails-assets-ic-ajax (2.0.2) rails-assets-ember (>= 1.2, < 2) rails-assets-imagesloaded (3.1.8) rails-assets-eventEmitter (~> 4.0) @@ -331,7 +330,7 @@ GEM rails-assets-livestampjs (1.1.2) rails-assets-lodash (2.4.1) rails-assets-microplugin (0.0.3) - rails-assets-moment (2.8.3) + rails-assets-moment (2.8.4) rails-assets-numeral (1.5.3) rails-assets-pnotify (2.0.1) rails-assets-qtip2 (2.2.1) @@ -346,9 +345,9 @@ GEM rails_config (0.4.2) activesupport (>= 3.0) rails_stdout_logging (0.0.3) - railties (3.2.19) - actionpack (= 3.2.19) - activesupport (= 3.2.19) + railties (3.2.21) + actionpack (= 3.2.21) + activesupport (= 3.2.21) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -358,18 +357,17 @@ GEM rdoc (3.12.2) json (~> 1.4) ref (1.0.5) - responders (1.1.1) + responders (1.1.2) railties (>= 3.2, < 4.2) - rest-client (1.7.2) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) - rollbar (1.1.0) + rest-client (1.6.7) + mime-types (>= 1.16) + rollbar (1.2.9) multi_json (~> 1.3) rspec (2.99.0) rspec-core (~> 2.99.0) rspec-expectations (~> 2.99.0) rspec-mocks (~> 2.99.0) - rspec-collection_matchers (1.0.0) + rspec-collection_matchers (1.1.2) rspec-expectations (>= 2.99.0.beta1) rspec-core (2.99.2) rspec-expectations (2.99.2) @@ -393,7 +391,7 @@ GEM powerpack (~> 0.0.6) rainbow (>= 1.99.1, < 3.0) ruby-progressbar (~> 1.4) - ruby-progressbar (1.6.0) + ruby-progressbar (1.7.0) safe_yaml (1.0.4) sass (3.2.19) sass-rails (3.2.6) @@ -406,7 +404,7 @@ GEM simplecov-html (~> 0.8.0) simplecov-html (0.8.0) slop (3.6.0) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -418,31 +416,31 @@ GEM net-scp (>= 1.1.2) net-ssh (>= 2.8.0) tabs_on_rails (2.2.0) - term-ansicolor (1.3.0) - tins (~> 1.0) + term-ansicolor (1.2.2) + tins (~> 0.8) therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref - thor (0.19.1) + thor (0.18.1) thread_safe (0.3.4) thread_safe (0.3.4-java) tilt (1.4.1) - tins (1.3.3) + tins (0.13.2) treetop (1.4.15) polyglot polyglot (>= 0.3.1) turbo-sprockets-rails3 (0.3.13) railties (> 3.2.8, < 4.0.0) sprockets (>= 2.2.0) - tzinfo (0.3.41) + tzinfo (0.3.42) uglifier (2.5.3) execjs (>= 0.3.0) json (>= 1.8.0) uuidtools (2.1.5) warden (1.2.3) rack (>= 1.0) - websocket-driver (0.3.5) - websocket-driver (0.3.5-java) + websocket-driver (0.4.0) + websocket-driver (0.4.0-java) xpath (2.0.0) nokogiri (~> 1.3) @@ -500,7 +498,7 @@ DEPENDENCIES rabl (~> 0.11.0) rack-proxy (~> 0.5.16) rack-timeout (~> 0.0.4) - rails (~> 3.2.19) + rails (~> 3.2.21) rails-assets-ace-builds (~> 1.1.7) rails-assets-bootbox (~> 3.3.0) rails-assets-bootstrap-daterangepicker (~> 1.3.12) @@ -524,7 +522,7 @@ DEPENDENCIES rails-assets-spinjs (~> 2.0.0) rails_config (~> 0.4.2) rails_stdout_logging (~> 0.0.3) - rollbar (~> 1.1.0) + rollbar (~> 1.2.9) rspec-html-matchers (~> 0.5.0) rspec-rails (~> 2.99.0) rubocop (~> 0.26.1)