diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-02 15:04:54 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-02-02 15:04:54 +0100 |
| commit | d3affe8bca5f5944c6819be1261cc4da7a2c9420 (patch) | |
| tree | 047472310ccd89fb43a84101a6441917c461ebf1 /Gemfile.lock | |
| parent | e08aa3df905f09f1c964fb056cba922a1d6eaa85 (diff) | |
| parent | 6cffcb05882b0d3c4a02f9acf21806e25ea09ec3 (diff) | |
| download | gitlab-ce-d3affe8bca5f5944c6819be1261cc4da7a2c9420.tar.gz | |
Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobs
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 211cb9a42ae..8c6e01ede84 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -953,6 +953,7 @@ DEPENDENCIES jquery-ui-rails (~> 5.0.0) kaminari (~> 0.16.3) letter_opener (~> 1.1.2) + loofah (~> 2.0.3) mail_room (~> 0.6.1) method_source (~> 0.8) minitest (~> 5.7.0) |