diff --git a/Gemfile b/Gemfile index a36dae8..9951dc2 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '4.0.1' +gem 'rails', '4.0.5' #gem 'bcrypt', '~> 3.1.7' @@ -46,7 +46,7 @@ gem 'kaminari-bootstrap' gem "htmlentities" gem 'carrierwave' -gem 'rmagick' +gem 'rmagick', "2.16.0" group :doc do # bundle exec rake doc:rails generates the API under doc/api. diff --git a/Gemfile.lock b/Gemfile.lock index 265ffe0..3ae7897 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,26 +8,26 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.0.1) - actionpack (= 4.0.1) + actionmailer (4.0.5) + actionpack (= 4.0.5) mail (~> 2.5.4) - actionpack (4.0.1) - activesupport (= 4.0.1) + actionpack (4.0.5) + activesupport (= 4.0.5) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) rack-test (~> 0.6.2) - activemodel (4.0.1) - activesupport (= 4.0.1) + activemodel (4.0.5) + activesupport (= 4.0.5) builder (~> 3.1.0) - activerecord (4.0.1) - activemodel (= 4.0.1) + activerecord (4.0.5) + activemodel (= 4.0.5) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.1) + activesupport (= 4.0.5) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.4) - activesupport (4.0.1) - i18n (~> 0.6, >= 0.6.4) + activesupport (4.0.5) + i18n (~> 0.6, >= 0.6.9) minitest (~> 4.2) multi_json (~> 1.3) thread_safe (~> 0.1) @@ -56,7 +56,7 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) - commonjs (0.2.6) + commonjs (0.2.7) concurrent-ruby (1.1.5) erubis (2.7.0) execjs (1.4.0) @@ -86,11 +86,12 @@ GEM kaminari (>= 0.13.0) rails kgio (2.11.2) - less (2.3.2) - commonjs (~> 0.2.6) - less-rails (2.3.3) - actionpack (>= 3.1) - less (~> 2.3.1) + less (2.6.0) + commonjs (~> 0.2.7) + less-rails (4.0.0) + actionpack (>= 4) + less (~> 2.6.0) + sprockets (>= 2) libv8 (3.16.14.19) mail (2.5.5) mime-types (~> 1.16) @@ -113,17 +114,17 @@ GEM rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) - rails (4.0.1) - actionmailer (= 4.0.1) - actionpack (= 4.0.1) - activerecord (= 4.0.1) - activesupport (= 4.0.1) + rails (4.0.5) + actionmailer (= 4.0.5) + actionpack (= 4.0.5) + activerecord (= 4.0.5) + activesupport (= 4.0.5) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.1) + railties (= 4.0.5) sprockets-rails (~> 2.0.0) - railties (4.0.1) - actionpack (= 4.0.1) - activesupport (= 4.0.1) + railties (4.0.5) + actionpack (= 4.0.5) + activesupport (= 4.0.5) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.19.0) @@ -131,7 +132,7 @@ GEM rdoc (3.12.2) json (~> 1.4) ref (2.0.0) - rmagick (3.1.0) + rmagick (2.16.0) rvm-capistrano (1.4.1) capistrano (>= 2.0.0) sdoc (0.3.20) @@ -188,8 +189,8 @@ DEPENDENCIES less-rails mysql2 nokogiri - rails (= 4.0.1) - rmagick + rails (= 4.0.5) + rmagick (= 2.16.0) rvm-capistrano sdoc therubyracer diff --git a/config/deploy.rb b/config/deploy.rb index c174c35..53c81e3 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,4 +1,4 @@ -set :rvm_ruby_string, 'ruby-2.3.0' +set :rvm_ruby_string, 'ruby-2.1.2' set :application, 'blog_eft_app' set :domain, 'quartz-www02.sysnove.net' diff --git a/config/env_init b/config/env_init index 1f13962..c9a87ca 100644 --- a/config/env_init +++ b/config/env_init @@ -1,4 +1,4 @@ -APP_RUBY=2.3.0 +APP_RUBY=2.1.2 ENV=production APP_ROOT=/srv/www/web/blog_eft_app/current/ GEM_HOME=/srv/www/web/.rvm/gems/ruby-$APP_RUBY