Skip to content

Commit 70ed64f

Browse files
authored
Merge pull request #13 from henriquesacramento/rails5
Rails 5 Upgrade
2 parents b37b719 + b395ce7 commit 70ed64f

20 files changed

Lines changed: 290 additions & 143 deletions

Gemfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ source 'https://rubygems.org'
22

33
ruby '2.3.1'
44

5+
gem 'rails', '5.0.0'
56
gem 'alert_message'
67
gem 'bootstrap-sass', '~> 3.3.3'
78
gem 'bootstrap-generators', git: 'git://github.com/decioferreira/bootstrap-generators.git'
@@ -23,7 +24,6 @@ gem 'jquery-ui-rails'
2324
gem 'mini_magick'
2425
gem 'modernizr-rails'
2526
gem 'pdfkit'
26-
gem 'rails', '4.2.1'
2727
gem 'rails-i18n'
2828
gem 'rails-env'
2929
gem 'randumb'
@@ -35,12 +35,14 @@ gem 'sprockets-rails', github: 'rails/sprockets-rails'
3535
gem 'turbolinks'
3636
gem 'uglifier', '>= 1.3.0'
3737
gem 'wkhtmltopdf-binary'
38+
gem 'record_tag_helper', '~> 1.0'
39+
3840

3941
group :development, :test do
4042
gem 'better_errors'
4143
gem 'binding_of_caller'
4244
gem 'rails_db_info'
43-
gem 'capybara'
45+
gem 'capybara', github: 'jnicklas/capybara'
4446
gem 'email_spec'
4547
gem 'database_rewinder'
4648
gem 'factory_girl_rails'
@@ -50,7 +52,7 @@ group :development, :test do
5052
gem 'selenium-webdriver'
5153
gem 'shoulda-matchers', '~> 3.0', require: false
5254
gem 'spring'
53-
gem 'simplecov', require: false
55+
gem 'simplecov', '0.11.1', require: false
5456
end
5557

5658
group :staging, :production do

0 commit comments

Comments
 (0)