diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-23 08:52:11 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-23 08:52:11 +0000 |
| commit | cf131aa4c7f24cd6aa430a33be6afca0a01fab21 (patch) | |
| tree | c32f1f0741aab6a2c6ab3135a2a67886413f742b /Gemfile.lock | |
| parent | 0c126dc82e57412c4d7f3e72d6c5a20904f27dab (diff) | |
| parent | 963052bf3c91100de010feb162cf5aa31ae33128 (diff) | |
| download | gitlab-ce-cf131aa4c7f24cd6aa430a33be6afca0a01fab21.tar.gz | |
Merge branch '31574-bootstrap-form-builder' into 'master'
Add bootstrap_form gem
See merge request !10985
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6226c6bebdf..4715363c5b8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,6 +86,7 @@ GEM bootstrap-sass (3.3.6) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) + bootstrap_form (2.7.0) brakeman (3.6.1) browser (2.2.0) builder (3.2.3) @@ -926,6 +927,7 @@ DEPENDENCIES better_errors (~> 2.1.0) binding_of_caller (~> 0.7.2) bootstrap-sass (~> 3.3.0) + bootstrap_form (~> 2.7.0) brakeman (~> 3.6.0) browser (~> 2.2) bullet (~> 5.5.0) |