From 4c79ac4a7557a2699253ce4abdc3de50b84e9ef2 Mon Sep 17 00:00:00 2001 From: Luke Barratt Date: Mon, 16 Jun 2014 15:10:41 +0100 Subject: [PATCH] Bump ruby to 2.1.2 See: http://www.omniref.com/blog/blog/2014/03/27/ruby-garbage-collection-still-not-ready-for-production/ --- .travis.yml | 2 +- Gemfile | 8 ++++--- Gemfile.lock | 22 +++++++------------- app/assets/javascripts/application.js.coffee | 2 +- app/assets/stylesheets/application.scss | 1 + config/deploy.rb | 3 ++- 6 files changed, 17 insertions(+), 21 deletions(-) create mode 100644 app/assets/stylesheets/application.scss diff --git a/.travis.yml b/.travis.yml index c6c4ccf..6be0efd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ addons: code_climate: repo_token: b3db5b7df9a0a1d0fd3503e72d7431ffbfa172492c2840d590ccb2fafd9172d3 rvm: - - 2.1.1 + - 2.1.2 env: - MYSQL_USERNAME=travis script: diff --git a/Gemfile b/Gemfile index 3be9603..2960242 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -ruby '2.1.1' +ruby '2.1.2' gem 'dotenv-rails', '~> 0.10.0' gem 'rails', '~> 3.2.18' @@ -17,7 +17,6 @@ gem 'bbcoder', '~> 1.0.1' gem 'sanitize', '~> 2.1.0' gem 'carrierwave', '~> 0.10.0' gem 'bluecloth', '~> 2.2.0' -gem 'therubyracer', '~> 0.12.1' gem 'newrelic_rpm', '~> 3.7.2.195' gem 'will_paginate', '~> 3.0.5' gem 'dynamic_form', '~> 1.1.4' @@ -25,6 +24,9 @@ gem 'country_code_select', '~> 1.0.1' gem 'active_link_to', '~> 1.0.2' gem 'rmagick', '~> 2.13.2', require: false +# Please install nodejs locally. +gem 'therubyracer', '~> 0.12.1' if RUBY_PLATFORM == 'x86_64-linux' + gem 'sprockets', '~> 2.2.1' gem 'coffee-rails', '~> 3.2.2' gem 'jquery-rails', '~> 2.0.2' @@ -66,5 +68,5 @@ group :test do end group :development, :test do - gem 'pry-debugger', '~> 0.2.2' + gem 'pry-byebug', '~> 1.3.2' end diff --git a/Gemfile.lock b/Gemfile.lock index 4b3bfc9..193b327 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,6 +45,9 @@ GEM sass (>= 3.2.0) thor builder (3.0.4) + byebug (2.7.0) + columnize (~> 0.3) + debugger-linecache (~> 1.2) capistrano (3.1.0) i18n rake (>= 10.0.0) @@ -88,12 +91,7 @@ GEM dalli (2.7.1) database_cleaner (1.2.0) debug_inspector (0.0.2) - debugger (1.6.6) - columnize (>= 0.3.1) - debugger-linecache (~> 1.2.0) - debugger-ruby_core_source (~> 1.3.2) debugger-linecache (1.2.0) - debugger-ruby_core_source (1.3.4) diff-lcs (1.2.5) dotenv (0.10.0) dotenv-rails (0.10.0) @@ -123,7 +121,6 @@ GEM railties (>= 3.1.0, < 5.0) thor (~> 0.14) json (1.8.1) - libv8 (3.16.14.3) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -153,9 +150,9 @@ GEM coderay (~> 1.0) method_source (~> 0.8) slop (~> 3.4) - pry-debugger (0.2.2) - debugger (~> 1.3) - pry (~> 0.9.10) + pry-byebug (1.3.2) + byebug (~> 2.7) + pry (~> 0.9.12) puma (2.8.2) rack (>= 1.1, < 2.0) quiet_assets (1.0.2) @@ -187,7 +184,6 @@ GEM rake (10.3.1) rdoc (3.12.2) json (~> 1.4) - ref (1.0.5) rmagick (2.13.2) rspec-core (2.14.8) rspec-expectations (2.14.5) @@ -230,9 +226,6 @@ GEM term-ansicolor term-ansicolor (1.3.0) tins (~> 1.0) - therubyracer (0.12.1) - libv8 (~> 3.16.14.0) - ref thor (0.19.1) tilt (1.4.1) timecop (0.7.1) @@ -289,7 +282,7 @@ DEPENDENCIES nokogiri (~> 1.6.1) oj (~> 2.5.5) poltergeist (~> 1.5.0) - pry-debugger (~> 0.2.2) + pry-byebug (~> 1.3.2) puma (~> 2.8.2) quiet_assets (~> 1.0.2) rails (~> 3.2.18) @@ -302,7 +295,6 @@ DEPENDENCIES selenium-webdriver (~> 2.41.0) simplecov (~> 0.7.1) sprockets (~> 2.2.1) - therubyracer (~> 0.12.1) timecop (~> 0.7.1) tinymce-rails (~> 3.5.9) uglifier (~> 2.5.0) diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 63237c4..29a6f8f 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -34,4 +34,4 @@ $ -> $('select.autosubmit').change -> $(this).closest('form').submit() - $('#notification').delay(3000).fadeOut() \ No newline at end of file + $('#notification').delay(3000).fadeOut() \ No newline at end of file diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 0000000..2af6646 --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1 @@ +// Placeholder - Sprockets doesn't like that this file may not exist \ No newline at end of file diff --git a/config/deploy.rb b/config/deploy.rb index 5cf56bf..e2ae9ca 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -9,7 +9,8 @@ set :repo_url, 'https://github.com/ENSL/ensl.org.git' set :keep_releases, 10 set :rbenv_type, :user -set :rbenv_ruby, '2.1.1' +set :rbenv_ruby, '2.1.2' +set :bundle_flags, '--quiet' set :dotenv_role, [:app, :web] set :puma_config, -> { File.join(current_path, 'config', 'puma.rb') }