mirror of
https://github.com/ENSL/ensl.org.git
synced 2024-12-28 13:31:06 +00:00
Bump ruby to 2.1.2
See: http://www.omniref.com/blog/blog/2014/03/27/ruby-garbage-collection-still-not-ready-for-production/
This commit is contained in:
parent
f287de542b
commit
4c79ac4a75
6 changed files with 17 additions and 21 deletions
|
@ -4,7 +4,7 @@ addons:
|
||||||
code_climate:
|
code_climate:
|
||||||
repo_token: b3db5b7df9a0a1d0fd3503e72d7431ffbfa172492c2840d590ccb2fafd9172d3
|
repo_token: b3db5b7df9a0a1d0fd3503e72d7431ffbfa172492c2840d590ccb2fafd9172d3
|
||||||
rvm:
|
rvm:
|
||||||
- 2.1.1
|
- 2.1.2
|
||||||
env:
|
env:
|
||||||
- MYSQL_USERNAME=travis
|
- MYSQL_USERNAME=travis
|
||||||
script:
|
script:
|
||||||
|
|
8
Gemfile
8
Gemfile
|
@ -1,6 +1,6 @@
|
||||||
source 'http://rubygems.org'
|
source 'http://rubygems.org'
|
||||||
|
|
||||||
ruby '2.1.1'
|
ruby '2.1.2'
|
||||||
|
|
||||||
gem 'dotenv-rails', '~> 0.10.0'
|
gem 'dotenv-rails', '~> 0.10.0'
|
||||||
gem 'rails', '~> 3.2.18'
|
gem 'rails', '~> 3.2.18'
|
||||||
|
@ -17,7 +17,6 @@ gem 'bbcoder', '~> 1.0.1'
|
||||||
gem 'sanitize', '~> 2.1.0'
|
gem 'sanitize', '~> 2.1.0'
|
||||||
gem 'carrierwave', '~> 0.10.0'
|
gem 'carrierwave', '~> 0.10.0'
|
||||||
gem 'bluecloth', '~> 2.2.0'
|
gem 'bluecloth', '~> 2.2.0'
|
||||||
gem 'therubyracer', '~> 0.12.1'
|
|
||||||
gem 'newrelic_rpm', '~> 3.7.2.195'
|
gem 'newrelic_rpm', '~> 3.7.2.195'
|
||||||
gem 'will_paginate', '~> 3.0.5'
|
gem 'will_paginate', '~> 3.0.5'
|
||||||
gem 'dynamic_form', '~> 1.1.4'
|
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 'active_link_to', '~> 1.0.2'
|
||||||
gem 'rmagick', '~> 2.13.2', require: false
|
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 'sprockets', '~> 2.2.1'
|
||||||
gem 'coffee-rails', '~> 3.2.2'
|
gem 'coffee-rails', '~> 3.2.2'
|
||||||
gem 'jquery-rails', '~> 2.0.2'
|
gem 'jquery-rails', '~> 2.0.2'
|
||||||
|
@ -66,5 +68,5 @@ group :test do
|
||||||
end
|
end
|
||||||
|
|
||||||
group :development, :test do
|
group :development, :test do
|
||||||
gem 'pry-debugger', '~> 0.2.2'
|
gem 'pry-byebug', '~> 1.3.2'
|
||||||
end
|
end
|
||||||
|
|
22
Gemfile.lock
22
Gemfile.lock
|
@ -45,6 +45,9 @@ GEM
|
||||||
sass (>= 3.2.0)
|
sass (>= 3.2.0)
|
||||||
thor
|
thor
|
||||||
builder (3.0.4)
|
builder (3.0.4)
|
||||||
|
byebug (2.7.0)
|
||||||
|
columnize (~> 0.3)
|
||||||
|
debugger-linecache (~> 1.2)
|
||||||
capistrano (3.1.0)
|
capistrano (3.1.0)
|
||||||
i18n
|
i18n
|
||||||
rake (>= 10.0.0)
|
rake (>= 10.0.0)
|
||||||
|
@ -88,12 +91,7 @@ GEM
|
||||||
dalli (2.7.1)
|
dalli (2.7.1)
|
||||||
database_cleaner (1.2.0)
|
database_cleaner (1.2.0)
|
||||||
debug_inspector (0.0.2)
|
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-linecache (1.2.0)
|
||||||
debugger-ruby_core_source (1.3.4)
|
|
||||||
diff-lcs (1.2.5)
|
diff-lcs (1.2.5)
|
||||||
dotenv (0.10.0)
|
dotenv (0.10.0)
|
||||||
dotenv-rails (0.10.0)
|
dotenv-rails (0.10.0)
|
||||||
|
@ -123,7 +121,6 @@ GEM
|
||||||
railties (>= 3.1.0, < 5.0)
|
railties (>= 3.1.0, < 5.0)
|
||||||
thor (~> 0.14)
|
thor (~> 0.14)
|
||||||
json (1.8.1)
|
json (1.8.1)
|
||||||
libv8 (3.16.14.3)
|
|
||||||
mail (2.5.4)
|
mail (2.5.4)
|
||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
treetop (~> 1.4.8)
|
treetop (~> 1.4.8)
|
||||||
|
@ -153,9 +150,9 @@ GEM
|
||||||
coderay (~> 1.0)
|
coderay (~> 1.0)
|
||||||
method_source (~> 0.8)
|
method_source (~> 0.8)
|
||||||
slop (~> 3.4)
|
slop (~> 3.4)
|
||||||
pry-debugger (0.2.2)
|
pry-byebug (1.3.2)
|
||||||
debugger (~> 1.3)
|
byebug (~> 2.7)
|
||||||
pry (~> 0.9.10)
|
pry (~> 0.9.12)
|
||||||
puma (2.8.2)
|
puma (2.8.2)
|
||||||
rack (>= 1.1, < 2.0)
|
rack (>= 1.1, < 2.0)
|
||||||
quiet_assets (1.0.2)
|
quiet_assets (1.0.2)
|
||||||
|
@ -187,7 +184,6 @@ GEM
|
||||||
rake (10.3.1)
|
rake (10.3.1)
|
||||||
rdoc (3.12.2)
|
rdoc (3.12.2)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
ref (1.0.5)
|
|
||||||
rmagick (2.13.2)
|
rmagick (2.13.2)
|
||||||
rspec-core (2.14.8)
|
rspec-core (2.14.8)
|
||||||
rspec-expectations (2.14.5)
|
rspec-expectations (2.14.5)
|
||||||
|
@ -230,9 +226,6 @@ GEM
|
||||||
term-ansicolor
|
term-ansicolor
|
||||||
term-ansicolor (1.3.0)
|
term-ansicolor (1.3.0)
|
||||||
tins (~> 1.0)
|
tins (~> 1.0)
|
||||||
therubyracer (0.12.1)
|
|
||||||
libv8 (~> 3.16.14.0)
|
|
||||||
ref
|
|
||||||
thor (0.19.1)
|
thor (0.19.1)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
timecop (0.7.1)
|
timecop (0.7.1)
|
||||||
|
@ -289,7 +282,7 @@ DEPENDENCIES
|
||||||
nokogiri (~> 1.6.1)
|
nokogiri (~> 1.6.1)
|
||||||
oj (~> 2.5.5)
|
oj (~> 2.5.5)
|
||||||
poltergeist (~> 1.5.0)
|
poltergeist (~> 1.5.0)
|
||||||
pry-debugger (~> 0.2.2)
|
pry-byebug (~> 1.3.2)
|
||||||
puma (~> 2.8.2)
|
puma (~> 2.8.2)
|
||||||
quiet_assets (~> 1.0.2)
|
quiet_assets (~> 1.0.2)
|
||||||
rails (~> 3.2.18)
|
rails (~> 3.2.18)
|
||||||
|
@ -302,7 +295,6 @@ DEPENDENCIES
|
||||||
selenium-webdriver (~> 2.41.0)
|
selenium-webdriver (~> 2.41.0)
|
||||||
simplecov (~> 0.7.1)
|
simplecov (~> 0.7.1)
|
||||||
sprockets (~> 2.2.1)
|
sprockets (~> 2.2.1)
|
||||||
therubyracer (~> 0.12.1)
|
|
||||||
timecop (~> 0.7.1)
|
timecop (~> 0.7.1)
|
||||||
tinymce-rails (~> 3.5.9)
|
tinymce-rails (~> 3.5.9)
|
||||||
uglifier (~> 2.5.0)
|
uglifier (~> 2.5.0)
|
||||||
|
|
1
app/assets/stylesheets/application.scss
Normal file
1
app/assets/stylesheets/application.scss
Normal file
|
@ -0,0 +1 @@
|
||||||
|
// Placeholder - Sprockets doesn't like that this file may not exist
|
|
@ -9,7 +9,8 @@ set :repo_url, 'https://github.com/ENSL/ensl.org.git'
|
||||||
set :keep_releases, 10
|
set :keep_releases, 10
|
||||||
|
|
||||||
set :rbenv_type, :user
|
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 :dotenv_role, [:app, :web]
|
||||||
|
|
||||||
set :puma_config, -> { File.join(current_path, 'config', 'puma.rb') }
|
set :puma_config, -> { File.join(current_path, 'config', 'puma.rb') }
|
||||||
|
|
Loading…
Reference in a new issue