diff --git a/Gemfile b/Gemfile index 9a530795..01261474 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' -gem 'rails', '4.0.0.rc2' -gem 'sass-rails', '4.0.0.rc2' -gem 'coffee-rails', '~>4.0' +gem 'rails', '~>4.0.0' +gem 'sass-rails', '~>4.0.0' +gem 'coffee-rails', '~>4.0.0' # todo: remove xml api gem 'actionpack-xml_parser', github: 'rails/actionpack-xml_parser' @@ -32,13 +32,13 @@ gem "cache_digests" gem "rack-mini-profiler" # To use ActiveModel has_secure_password -gem 'bcrypt-ruby' +gem 'bcrypt-ruby', '~> 3.0.0' # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks # gem 'turbolinks' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder -# gem 'jbuilder', '~> 1.0.1' +# gem 'jbuilder', '~> 1.2' group :development do gem "yard" diff --git a/Gemfile.lock b/Gemfile.lock index 7e29ba60..41d653b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,25 +10,25 @@ GEM specs: RedCloth (4.2.9) aasm (3.0.19) - actionmailer (4.0.0.rc2) - actionpack (= 4.0.0.rc2) + actionmailer (4.0.0) + actionpack (= 4.0.0) mail (~> 2.5.3) - actionpack (4.0.0.rc2) - activesupport (= 4.0.0.rc2) + actionpack (4.0.0) + activesupport (= 4.0.0) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.0.rc2) - activesupport (= 4.0.0.rc2) + activemodel (4.0.0) + activesupport (= 4.0.0) builder (~> 3.1.0) - activerecord (4.0.0.rc2) - activemodel (= 4.0.0.rc2) + activerecord (4.0.0) + activemodel (= 4.0.0) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.0.rc2) + activesupport (= 4.0.0) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.3) - activesupport (4.0.0.rc2) + activesupport (4.0.0) i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) @@ -99,7 +99,7 @@ GEM metaclass (0.0.1) mime-types (1.23) mini_portile (0.5.0) - minitest (4.7.4) + minitest (4.7.5) mocha (0.14.0) metaclass (~> 0.0.1) multi_json (1.7.7) @@ -112,19 +112,19 @@ GEM rack (>= 1.1.3) rack-test (0.6.2) rack (>= 1.0) - rails (4.0.0.rc2) - actionmailer (= 4.0.0.rc2) - actionpack (= 4.0.0.rc2) - activerecord (= 4.0.0.rc2) - activesupport (= 4.0.0.rc2) + rails (4.0.0) + actionmailer (= 4.0.0) + actionpack (= 4.0.0) + activerecord (= 4.0.0) + activesupport (= 4.0.0) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.0.rc2) + railties (= 4.0.0) sprockets-rails (~> 2.0.0) rails_autolink (1.1.0) rails (> 3.1) - railties (4.0.0.rc2) - actionpack (= 4.0.0.rc2) - activesupport (= 4.0.0.rc2) + railties (4.0.0) + actionpack (= 4.0.0) + activesupport (= 4.0.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.1.0) @@ -136,7 +136,7 @@ GEM sanitize (2.0.4) nokogiri (~> 1.6.0) sass (3.2.9) - sass-rails (4.0.0.rc2) + sass-rails (4.0.0) railties (>= 4.0.0.beta, < 5.0) sass (>= 3.1.10) sprockets-rails (~> 2.0.0) @@ -196,11 +196,11 @@ DEPENDENCIES actionpack-xml_parser! acts_as_list aruba - bcrypt-ruby + bcrypt-ruby (~> 3.0.0) bullet cache_digests capybara - coffee-rails (~> 4.0) + coffee-rails (~> 4.0.0) cucumber-rails database_cleaner factory_girl_rails @@ -209,11 +209,11 @@ DEPENDENCIES mocha mysql2 rack-mini-profiler - rails (= 4.0.0.rc2) + rails (~> 4.0.0) rails_autolink rspec-expectations sanitize - sass-rails (= 4.0.0.rc2) + sass-rails (~> 4.0.0) selenium-webdriver simplecov sqlite3