Skip to content
This repository has been archived by the owner on Feb 20, 2022. It is now read-only.

Develop #279

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Develop #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b38d534
Update bootstrap-sass
rkdora Mar 13, 2019
a292ba3
Update gem bootstrap-sass
rkdora Mar 13, 2019
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ gem 'rails-i18n'
gem 'bootsnap', '>= 1.1.0', require: false

# For bootstrap
gem 'bootstrap-sass', '>= 3.3.7'
gem 'bootstrap-sass', ">= 3.4.1"

# For Image Upload
gem 'carrierwave'
Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ GEM
io-like (~> 0.3.0)
arel (9.0.0)
ast (2.4.0)
autoprefixer-rails (9.4.3)
autoprefixer-rails (9.4.10.2)
execjs
bcrypt (3.1.12)
bindex (0.5.0)
bootsnap (1.3.2)
msgpack (~> 1.0)
bootstrap-sass (3.4.0)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
builder (3.2.3)
Expand Down Expand Up @@ -237,8 +237,8 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sassc (2.0.0)
ffi (~> 1.9.6)
sassc (2.0.1)
ffi (~> 1.9)
rake
selenium-webdriver (3.141.0)
childprocess (~> 0.5)
Expand Down Expand Up @@ -289,7 +289,7 @@ DEPENDENCIES
anime_js_rails
bcrypt
bootsnap (>= 1.1.0)
bootstrap-sass (>= 3.3.7)
bootstrap-sass (>= 3.4.1)
byebug
capybara (>= 2.15, < 4.0)
carrierwave
Expand Down