Upgraded from Rails 4.0 to 4.2
This commit is contained in:
parent
7acd9caecd
commit
a771d7c0fb
2 changed files with 153 additions and 112 deletions
27
Gemfile
27
Gemfile
|
|
@ -1,19 +1,19 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
||||
gem 'rails', '4.0.0'
|
||||
gem 'rails', '4.2.0'
|
||||
|
||||
# Use sqlite3 as the database for Active Record
|
||||
# gem 'sqlite3'
|
||||
|
||||
# Use SCSS for stylesheets
|
||||
gem 'sass-rails', '~> 4.0.0'
|
||||
gem 'sass-rails', '~> 5.0'
|
||||
|
||||
# Use Uglifier as compressor for JavaScript assets
|
||||
gem 'uglifier', '>= 1.3.0'
|
||||
|
||||
# Use CoffeeScript for .js.coffee assets and views
|
||||
gem 'coffee-rails', '~> 4.0.0'
|
||||
gem 'coffee-rails', '~> 4.1.0'
|
||||
|
||||
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
|
||||
# gem 'therubyracer', platforms: :ruby
|
||||
|
|
@ -26,11 +26,11 @@ gem 'jquery-rails'
|
|||
#gem 'turbolinks'
|
||||
|
||||
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
|
||||
gem 'jbuilder', '~> 1.2'
|
||||
gem 'jbuilder', '~> 2.0'
|
||||
|
||||
group :doc do
|
||||
# bundle exec rake doc:rails generates the API under doc/api.
|
||||
gem 'sdoc', require: false
|
||||
gem 'sdoc', '~> 0.4.0'
|
||||
end
|
||||
|
||||
# Use ActiveModel has_secure_password
|
||||
|
|
@ -53,14 +53,19 @@ group :development do
|
|||
gem "binding_of_caller"
|
||||
|
||||
# Chrome Rails debugging app
|
||||
gem 'meta_request'
|
||||
#gem 'meta_request'
|
||||
end
|
||||
|
||||
# Twitter Bootstrap template
|
||||
#gem 'bootstrap-sass'
|
||||
#gem 'anjlab-bootstrap-rails', '>= 3.0.0.0'
|
||||
# gem 'anjlab-bootstrap-rails', :require => 'bootstrap-rails',
|
||||
# :github => 'anjlab/bootstrap-rails'
|
||||
group :development, :test do
|
||||
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
|
||||
gem 'byebug'
|
||||
|
||||
# Access an IRB console on exception pages or by using <%= console %> in views
|
||||
gem 'web-console', '~> 2.0'
|
||||
|
||||
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
|
||||
gem 'spring'
|
||||
end
|
||||
|
||||
# Zurb Foundation
|
||||
gem 'foundation-rails'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue