diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-05-26 00:05:53 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-05-26 00:05:53 +0300 |
| commit | 74894a38779adb32a8b8a3cdad8358fc98693403 (patch) | |
| tree | 4bf957d7b513797b03e571f451a760e2eb1524d8 /Gemfile | |
| parent | 6f4935bcee76a7af532399945f440a8fbd15658e (diff) | |
| parent | d219ed25fa0b67984984f0b5f60f1eff7a0c34c9 (diff) | |
Merge branch 'bootstrap4' into 'master'
Upgrade to Bootstrap 4
Closes #45185 and #46710
See merge request gitlab-org/gitlab-ce!18232
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -257,7 +257,6 @@ gem 'sass-rails', '~> 5.0.6' gem 'uglifier', '~> 2.7.2' gem 'addressable', '~> 2.5.2' -gem 'bootstrap-sass', '~> 3.3.0' gem 'font-awesome-rails', '~> 4.7' gem 'gemojione', '~> 3.3' gem 'gon', '~> 6.2' |