Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump devise-bootstrap-views from 0.0.11 to 1.1.0 in /WcaOnRails #3231

Merged
merged 1 commit into from
Aug 20, 2018
Merged

Bump devise-bootstrap-views from 0.0.11 to 1.1.0 in /WcaOnRails #3231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions WcaOnRails/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ gem 'recaptcha', require: 'recaptcha/rails'
gem 'kaminari'
gem 'kaminari-i18n'
gem 'devise'
# Note: we put devise-i18n after devise-bootstrap-views intentionally.
# See https://github.com/thewca/worldcubeassociation.org/pull/2663 for more details.
gem 'devise-bootstrap-views'
# Note: we put devise-18n before devise-bootstrap-views intentionally.
# See https://github.com/hisea/devise-bootstrap-views/issues/55 for more details.
gem 'devise-i18n'
gem 'devise-bootstrap-views'
gem 'doorkeeper'
gem 'doorkeeper-i18n'
gem 'strip_attributes'
Expand Down
2 changes: 1 addition & 1 deletion WcaOnRails/Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ GEM
railties (>= 4.1.0, < 6.0)
responders
warden (~> 1.2.3)
devise-bootstrap-views (0.0.11)
devise-bootstrap-views (1.1.0)
devise-i18n (1.6.4)
devise (>= 4.4)
diff-lcs (1.3)
Expand Down
2 changes: 0 additions & 2 deletions WcaOnRails/app/assets/stylesheets/application.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
@import "variables";
@import "bootstrap_and_overrides";

/* Courtesy of https://github.com/hisea/devise-bootstrap-views */
@import "devise_bootstrap_views";
@import "bootstrap-datetimepicker";
@import "cubing-icons";
@import "selectize";
Expand Down