diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-19 01:59:19 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-19 01:59:19 +0300 |
| commit | e26ce27d5bac302785086d426e7b1a4c5b33f74a (patch) | |
| tree | 1e8efcc61d2e4e62aea64282904d1edc47475868 /Gemfile | |
| parent | 717366d28da11acc6dbe60301bf7e2394400b3c1 (diff) | |
| parent | 01fc7633d089faad3314bb8bc1a70d27c27aef70 (diff) | |
Merge branch 'rs-issue-21017' into 'master'
Update Hamlit to 2.6.1
Fixes gitlab-org/gitlab-ce#21025 and gitlab-org/gitlab-ce#21017
See merge request !5873
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -77,7 +77,7 @@ gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' gem 'kaminari', '~> 0.17.0' # HAML -gem 'hamlit', '~> 2.5' +gem 'hamlit', '~> 2.6.1' # Files attachments gem 'carrierwave', '~> 0.10.0' |