diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-07 23:53:57 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-07 23:53:57 +0000 |
| commit | cfb5a76bb26521ff3ff68acc20466ea7feb49d9f (patch) | |
| tree | cb18b90a1d628d25bf1aa9846a00856471a5b8b2 /app/views/admin/projects/show.html.haml | |
| parent | 068b1aeef94846fdcd96fe537ac5353cc0b6b198 (diff) | |
| parent | c231178a7ee69f13e19c5110e7176ce9f05743a7 (diff) | |
| download | gitlab-ce-cfb5a76bb26521ff3ff68acc20466ea7feb49d9f.tar.gz | |
Merge branch 'upgrade-oauth2' into 'master'
Upgrade oauth2 from 1.0.0 to 1.2.0.
Changelog: https://github.com/intridea/oauth2/compare/v1.0.0...v1.2.0
Follow-up on !3434 since 1.2.0 doesn't limit the JWT version we can use.
Adds support for Rails 5. Working toward #14286.
See merge request !5041
Diffstat (limited to 'app/views/admin/projects/show.html.haml')
0 files changed, 0 insertions, 0 deletions