Skip to content
This repository was archived by the owner on Mar 12, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
gem 'pg', '0.20.0' # lock at 0.20.0
# rails 5.1 requires money-rails upgrades which broken tests
gem 'rails', '4.2.11.1'
gem 'sass-rails', '5.0.7'
gem 'sass-rails', '6.0.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 1.0.0', group: :doc
gem 'turbolinks', '5.2.1'
Expand Down
28 changes: 16 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ GEM
fabrication (2.20.1)
faker (1.9.3)
i18n (>= 0.7)
ffi (1.9.25)
ffi (1.12.2)
globalid (0.4.2)
activesupport (>= 4.2.0)
haml (5.0.1)
Expand Down Expand Up @@ -232,7 +232,7 @@ GEM
rake
rake (12.3.3)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
rdoc (6.0.1)
regexp_parser (1.3.0)
Expand Down Expand Up @@ -265,17 +265,21 @@ GEM
ruby-progressbar (1.9.0)
ruby_parser (3.9.0)
sexp_processor (~> 4.1)
sass (3.7.3)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.2.1)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
sdoc (1.0.0)
rdoc (>= 5.0)
sexp_processor (4.9.0)
Expand All @@ -288,7 +292,7 @@ GEM
simplecov-html (0.10.2)
spring (2.0.2)
activesupport (>= 4.2)
sprockets (3.7.2)
sprockets (4.0.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
Expand All @@ -304,7 +308,7 @@ GEM
tins (~> 1.0)
thor (1.0.1)
thread_safe (0.3.6)
tilt (2.0.8)
tilt (2.0.10)
tins (1.20.2)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
Expand Down Expand Up @@ -364,7 +368,7 @@ DEPENDENCIES
rspec-rails (~> 3.8.2)
rubocop (~> 0.49.1)
rubocop-rspec (~> 1.16.0)
sass-rails (= 5.0.7)
sass-rails (= 6.0.0)
sdoc (~> 1.0.0)
shoulda-matchers (= 2.8.0)
simplecov (~> 0.16.1)
Expand Down