Skip to content

Commit

Permalink
Update Rails and node-sass
Browse files Browse the repository at this point in the history
  • Loading branch information
marcaltmann committed Jan 15, 2018
1 parent 668b90f commit ca72c88
Show file tree
Hide file tree
Showing 4 changed files with 4,666 additions and 1,904 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem 'rails', '5.0.0.rc1'
# Use Puma as the app server
gem 'puma'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
gem 'sass-rails', '~> 5.0.6'

##################
### JAVASCRIPT ###
Expand Down
14 changes: 7 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -497,9 +497,9 @@ GEM
rubyzip (1.2.1)
rufus-scheduler (3.2.2)
safe_yaml (1.0.4)
sass (3.4.22)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (3.4.25)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
Expand Down Expand Up @@ -543,7 +543,7 @@ GEM
spring-watcher-listen (2.0.0)
listen (>= 2.7, < 4.0)
spring (~> 1.2)
sprockets (3.6.0)
sprockets (3.6.3)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.4)
Expand Down Expand Up @@ -588,9 +588,9 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
websocket-driver (0.6.3)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
websocket-extensions (0.1.3)
xpath (2.1.0)
nokogiri (~> 1.3)
ya2yaml (0.31)
Expand Down Expand Up @@ -677,7 +677,7 @@ DEPENDENCIES
redis (>= 3.0)
reform
rubocop
sass-rails (~> 5.0)
sass-rails (~> 5.0.6)
selenium-webdriver
shoulda
sidekiq
Expand Down

0 comments on commit ca72c88

Please sign in to comment.