diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-20 13:28:39 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-20 13:28:39 -0700 |
| commit | 33c319508e3e554db6c6d673cb0f564262133e06 (patch) | |
| tree | 321ca46988e6b7baa41f7aabbc7d7eff073ae279 /config | |
| parent | 69fe32a51c1f0299663177cad47641c50af5caec (diff) | |
| parent | 3873617548c03359e4fb9e093d181a7d61f642c4 (diff) | |
| download | gitlab-ce-33c319508e3e554db6c6d673cb0f564262133e06.tar.gz | |
Merge branch 'master' into sh-support-bitbucket-server-import
Diffstat (limited to 'config')
| -rw-r--r-- | config/boot.rb | 5 | ||||
| -rw-r--r-- | config/initializers/bootstrap_form.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/config/boot.rb b/config/boot.rb index 84f390f3228..655c54ddb84 100644 --- a/config/boot.rb +++ b/config/boot.rb @@ -9,3 +9,8 @@ ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../#{gemfile}", __dir__) # Set up gems listed in the Gemfile. require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) +begin + require 'bootsnap/setup' +rescue LoadError + # bootsnap is optional dependency, so if we don't have it it's fine +end diff --git a/config/initializers/bootstrap_form.rb b/config/initializers/bootstrap_form.rb index 11171b38a85..bbc1d83a63f 100644 --- a/config/initializers/bootstrap_form.rb +++ b/config/initializers/bootstrap_form.rb @@ -1,6 +1,6 @@ module BootstrapFormBuilderCustomization def label_class - "label-light" + "label-bold" end end |