Skip to content

Commit 6886306

Browse files
committed
upgrades ruby, rails, switches to postgres for development
1 parent bf53443 commit 6886306

File tree

8 files changed

+990
-219
lines changed

8 files changed

+990
-219
lines changed

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# Ignore bundler config.
22
/.bundle
33

4-
# Ignore the default SQLite database.
5-
/db/*.sqlite3
6-
/db/*.sqlite3-journal
7-
84
# Ignore all logfiles and tempfiles.
95
/log/*.log
106
/tmp

Gemfile

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,42 @@
11
source 'https://rubygems.org'
2-
ruby '2.0.0'
3-
4-
gem 'rails', '4.0.8'
5-
gem 'sprockets', '2.11.0'
6-
gem 'bcrypt-ruby', '3.1.2'
7-
gem 'faker', '1.1.2'
8-
gem 'will_paginate', '3.0.4'
9-
gem "paperclip", "~> 4.2"
2+
ruby '2.5.3'
3+
4+
gem 'rails', '5.2.2'
5+
gem 'sprockets'
6+
gem 'bcrypt-ruby'
7+
gem 'faker'
8+
gem 'will_paginate'
9+
gem "paperclip"
1010
gem "cancan"
1111
gem "jquery-slick-rails"
12+
gem 'pg'
13+
14+
gem 'activeadmin'
1215

1316
group :development, :test do
14-
gem 'sqlite3', '1.3.8'
15-
gem 'rspec-rails', '2.13.1'
16-
gem 'pry-byebug', '~> 2.0.0'
17+
gem 'rspec-rails'
18+
gem 'pry-byebug'
1719
end
1820

1921
group :test do
2022
gem 'selenium-webdriver', '2.35.1'
2123
gem 'capybara', '2.1.0'
2224
end
2325

24-
gem 'sass-rails', '4.0.3'
25-
gem 'uglifier', '2.1.1'
26-
gem 'coffee-rails', '4.0.1'
27-
gem 'jquery-rails', '3.0.4'
28-
gem 'fancybox2-rails', '~> 0.2.8'
29-
gem 'jbuilder', '1.0.2'
30-
gem 'factory_girl_rails', '4.2.0'
26+
gem 'sass-rails'
27+
gem 'uglifier'
28+
gem 'coffee-rails'
29+
gem 'jquery-rails'
30+
gem 'fancybox2-rails'
31+
gem 'jbuilder'
32+
gem 'factory_girl_rails'
3133
gem 'aws-sdk'
3234

3335
group :doc do
34-
gem 'sdoc', '0.3.20', require: false
36+
gem 'sdoc', require: false
3537
end
3638

3739
group :production do
38-
gem 'pg', '0.15.1'
39-
gem 'rails_12factor', '0.0.2'
40+
41+
gem 'rails_12factor'
4042
end

0 commit comments

Comments
 (0)