diff --git a/Gemfile b/Gemfile index f12bb2cf0c..7118b7c5fe 100644 --- a/Gemfile +++ b/Gemfile @@ -76,7 +76,7 @@ gem 'mysql2', '~> 0.3.16' gem 'multi_xml' gem 'nokogiri', '~> 1.6.4' gem 'omniauth' -gem 'rails' , '4.2.1rc2' +gem 'rails' , '4.2.1' gem 'rufus-scheduler', '~> 3.0.8', require: false gem 'sass-rails', '~> 5.0' gem 'select2-rails', '~> 3.5.4' diff --git a/Gemfile.lock b/Gemfile.lock index f34c27ebf5..ff63391797 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,36 +12,36 @@ GEM remote: https://rubygems.org/ specs: ace-rails-ap (2.0.1) - actionmailer (4.2.1.rc2) - actionpack (= 4.2.1.rc2) - actionview (= 4.2.1.rc2) - activejob (= 4.2.1.rc2) + actionmailer (4.2.1) + actionpack (= 4.2.1) + actionview (= 4.2.1) + activejob (= 4.2.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.1.rc2) - actionview (= 4.2.1.rc2) - activesupport (= 4.2.1.rc2) + actionpack (4.2.1) + actionview (= 4.2.1) + activesupport (= 4.2.1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.1) - actionview (4.2.1.rc2) - activesupport (= 4.2.1.rc2) + actionview (4.2.1) + activesupport (= 4.2.1) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.1) - activejob (4.2.1.rc2) - activesupport (= 4.2.1.rc2) + activejob (4.2.1) + activesupport (= 4.2.1) globalid (>= 0.3.0) - activemodel (4.2.1.rc2) - activesupport (= 4.2.1.rc2) + activemodel (4.2.1) + activesupport (= 4.2.1) builder (~> 3.1) - activerecord (4.2.1.rc2) - activemodel (= 4.2.1.rc2) - activesupport (= 4.2.1.rc2) + activerecord (4.2.1) + activemodel (= 4.2.1) + activesupport (= 4.2.1) arel (~> 6.0) - activesupport (4.2.1.rc2) + activesupport (4.2.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -229,11 +229,11 @@ GEM memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.8.2) - mime-types (1.25.1) + mime-types (2.4.3) mini_portile (0.6.2) minitest (5.5.1) mqtt (0.3.1) - multi_json (1.10.1) + multi_json (1.11.0) multi_xml (0.5.5) multipart-post (2.0.0) mysql2 (0.3.16) @@ -284,33 +284,33 @@ GEM rack (1.6.0) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.1.rc2) - actionmailer (= 4.2.1.rc2) - actionpack (= 4.2.1.rc2) - actionview (= 4.2.1.rc2) - activejob (= 4.2.1.rc2) - activemodel (= 4.2.1.rc2) - activerecord (= 4.2.1.rc2) - activesupport (= 4.2.1.rc2) + rails (4.2.1) + actionmailer (= 4.2.1) + actionpack (= 4.2.1) + actionview (= 4.2.1) + activejob (= 4.2.1) + activemodel (= 4.2.1) + activerecord (= 4.2.1) + activesupport (= 4.2.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.1.rc2) + railties (= 4.2.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.5) + rails-dom-testing (1.0.6) activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.1) + rails-html-sanitizer (1.0.2) loofah (~> 2.0) rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging rails_serve_static_assets (0.0.4) rails_stdout_logging (0.0.3) - railties (4.2.1.rc2) - actionpack (= 4.2.1.rc2) - activesupport (= 4.2.1.rc2) + railties (4.2.1) + actionpack (= 4.2.1) + activesupport (= 4.2.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) @@ -410,7 +410,7 @@ GEM libv8 (~> 3.16.14.0) ref thor (0.19.1) - thread_safe (0.3.4) + thread_safe (0.3.5) tilt (1.4.1) timers (4.0.1) hitimes @@ -528,7 +528,7 @@ DEPENDENCIES pry quiet_assets rack - rails (= 4.2.1rc2) + rails (= 4.2.1) rails_12factor rr rspec (~> 3.2)