Skip to content

Commit

Permalink
Merge pull request #285 from TheDesignExchange/fix/navbar/#279
Browse files Browse the repository at this point in the history
fixed gemfile
  • Loading branch information
jschnapper authored Nov 28, 2018
2 parents fef9767 + eb5aaf8 commit 06b4e5d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
12 changes: 0 additions & 12 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,4 @@ gem "hash_control"

gem 'recaptcha', :require => 'recaptcha/rails'

gem 'sass-rails', '~> 5.0', '>= 5.0.6'

# register sprockets
if env.respond_to?(:register_transformer)
env.register_mime_type 'text/css', extensions: ['.css'], charset: :css
env.register_preprocessor 'text/css', MySprocketsExtension
end

if env.respond_to?(:register_engine)
args = ['.css', MySprocketsExtension]
args << { mime_type: 'text/css', silence_deprecation: true } if Sprockets::VERSION.start_with?("3")
env.register_engine(*args)
end
1 change: 0 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,6 @@ DEPENDENCIES
rgl
role_model (~> 0.8.2)
rspec-rails (~> 3.5, >= 3.5.2)
sass-rails (~> 5.0, >= 5.0.6)
seed_dump
selenium-webdriver
spreadsheet
Expand Down

0 comments on commit 06b4e5d

Please sign in to comment.