Skip to content
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
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ gem 'headline_sources', git: 'https://github.com/wilg/headline-sources.git'

gem 'pg'
gem 'haml'
gem 'sass-rails', '~> 4.0.3'
gem 'sass-rails', '~> 6.0.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.2.2'
gem 'jquery-rails'
Expand All @@ -19,7 +19,7 @@ gem 'rack-cors'
gem 'bootstrap-sass', '~> 3.4.1'
gem 'font-awesome-rails'
gem 'will_paginate-bootstrap'
gem 'handlebars_assets'
gem 'handlebars_assets', '0.23.2'
gem 'font_assets'
gem 'rails_autolink'
gem 'rails-timeago', '~> 2.0'
Expand Down
43 changes: 20 additions & 23 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,10 @@ GEM
haml (5.0.0)
temple (>= 0.8.0)
tilt
handlebars_assets (0.20.2)
handlebars_assets (0.23.2)
execjs (~> 2.0)
multi_json (~> 1.0)
sprockets (>= 2.0.0, < 4.0)
tilt (~> 1.2)
hike (1.2.3)
sprockets (>= 2.0.0)
tilt (>= 1.2)
htmlentities (4.3.4)
http (0.6.4)
http_parser.rb (~> 0.6.0)
Expand Down Expand Up @@ -144,7 +142,6 @@ GEM
mini_portile2 (2.4.0)
minitest (5.13.0)
mousetrap-rails (1.4.6)
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
naught (1.0.0)
Expand Down Expand Up @@ -211,29 +208,29 @@ GEM
crass (~> 1.0.2)
nokogiri (>= 1.4.4)
nokogumbo (~> 1.4)
sass (3.2.19)
sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0)
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
sax-machine (1.3.2)
simple_oauth (0.3.1)
snoo (0.1.2)
httparty
nokogiri
spring (2.1.0)
sprockets (2.12.5)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
temple (0.8.2)
thor (0.19.4)
thread_safe (0.3.6)
Expand Down Expand Up @@ -280,7 +277,7 @@ DEPENDENCIES
font_assets
foreman
haml
handlebars_assets
handlebars_assets (= 0.23.2)
headline_sources!
jbuilder
jquery-hoverIntent-rails
Expand All @@ -300,7 +297,7 @@ DEPENDENCIES
rakismet
rollbar
ruby-prof
sass-rails (~> 4.0.3)
sass-rails (~> 6.0.0)
spring
tweet-button
twitter
Expand Down