diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-25 22:26:13 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-25 22:26:13 +0000 |
| commit | 6ff740ff9484691750f3eadf12125fd362efe61c (patch) | |
| tree | 722248f555b3dbe02095dcbd384a236d890d2045 /app/views/projects/triggers/_trigger.html.haml | |
| parent | 48f516a84376c5e9942ffad456f2f82dc9f6e7ad (diff) | |
| parent | 49961bff661dcd6f5bcfa0abeb1c2461a0d042bc (diff) | |
| download | gitlab-ce-6ff740ff9484691750f3eadf12125fd362efe61c.tar.gz | |
Merge branch 'upgrade-gitlab-grit' into 'master'
Upgrade gitlab-grit gem to 2.8.1, loosening the mime-types gem's version dependency.
Changelog for mime-types: https://github.com/mime-types/ruby-mime-types/blob/master/History.rdoc
Resolves #15101.
See merge request !3901
Diffstat (limited to 'app/views/projects/triggers/_trigger.html.haml')
0 files changed, 0 insertions, 0 deletions