Skip to content

Commit

Permalink
GRN2-45, GRN2-197: Upgrade Rails to 5.2.3 and removed sass-rails gem (b…
Browse files Browse the repository at this point in the history
…igbluebutton#636)

* Removed deprecate sass-rails and replace with sassc-rails

* Upgraded to Rails 5.2.3

* Fixed travis

* Added back Spring code

* Fixed travis again
  • Loading branch information
farhatahmad authored Jul 15, 2019
1 parent ad2321e commit 5a3ad31
Show file tree
Hide file tree
Showing 19 changed files with 228 additions and 155 deletions.
9 changes: 6 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ git_source(:github) do |repo_name|
end

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0.7'
gem 'rails', '~> 5.2.3'

# Use Puma as the app server
gem 'puma', '~> 3.0'

# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
gem 'sassc-rails'

# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
Expand All @@ -40,6 +40,9 @@ gem 'redis', '~> 3.0'
# Use ActiveModel has_secure_password
gem 'bcrypt', '~> 3.1.7'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', require: false

# Authentication.
gem 'omniauth'
gem 'omniauth-twitter'
Expand All @@ -54,7 +57,7 @@ gem 'bigbluebutton-api-ruby'

# Front-end.
gem 'bootstrap', '~> 4.3.1'
gem 'tabler-rubygem'
gem 'tabler-rubygem', git: 'https://github.com/vbalazs/tabler-rubygem.git', branch: 'fix-sass'
gem 'pagy'

# For detecting the users preferred language.
Expand Down
Loading

0 comments on commit 5a3ad31

Please sign in to comment.