Skip to content

Upgrade ruby and rails version #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 22, 2017
Merged

Upgrade ruby and rails version #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30562f3
[PFST-1492] Upgrade Rails and Ruby version
lujiaZ Jan 19, 2017
ca55039
Update .ruby-version config file
lujiaZ Jan 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.1
2.3.3
37 changes: 14 additions & 23 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
source 'https://rubygems.org'

gem 'rails', '3.2.18'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'

gem 'mysql2'
gem 'rails', '4.0.6'
gem 'mysql2', '0.3.17'
gem 'syslogger', git: 'https://github.com/jbussdieker/syslogger.git', :branch => 'implement_log_formatter'
gem 'puppet'
gem 'mcollective-client'
gem 'chartkick'
Expand All @@ -14,18 +11,19 @@ gem 'rails-bootstrap', '~> 3.0.0'
gem 'kaminari'
gem 'unicorn'

gem 'sass-rails', '~> 4.0.0'
gem 'coffee-rails', '~> 4.0.0'
gem 'uglifier', '>= 1.0.3'
gem 'jquery-rails'
gem 'awesome_print', require:"ap"

# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', :platforms => :ruby
# attr_accessible` is extracted out of Rails into a gem.
# Please use new recommended protection model for params(strong_parameters)
# or add `protected_attributes` to your Gemfile to use old one
gem 'protected_attributes'

gem 'uglifier', '>= 1.0.3'
end
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', :platforms => :ruby

group :development, :test do
gem 'rspec-rails'
Expand All @@ -40,11 +38,6 @@ group :test do
gem 'database_cleaner'
end

gem 'jquery-rails'

# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'

# To use Jbuilder templates for JSON
# gem 'jbuilder'

Expand All @@ -56,5 +49,3 @@ gem 'jquery-rails'

# To use debugger
# gem 'debugger'

gem 'syslogger', git: 'https://github.com/jbussdieker/syslogger.git', :branch => 'implement_log_formatter'
Loading