diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-09-28 21:38:06 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-09-28 21:38:06 +0800 |
| commit | e9060da6f0aee35d1d6b7a9158a102c4b197a965 (patch) | |
| tree | cb4235d6eabd6a9470f7b4b01673adf4f0fcdad6 /Gemfile.lock | |
| parent | 028712fb843881f5c51d84e6b1edf77da2bc76ca (diff) | |
| parent | 576425f029aae35d2489b058595dd40ae2ae6e2c (diff) | |
| download | gitlab-ce-e9060da6f0aee35d1d6b7a9158a102c4b197a965.tar.gz | |
Merge remote-tracking branch 'upstream/master' into gem/sm/bump-google-api-client-gem-from-0-8-6-to-0-13-6
* upstream/master: (130 commits)
Handle error when fetching ref for MR with deleted source branch
refactor emails service
fix update service
refactor users update service
refactor keys controller
refactor some controllers to make them EE friendly
fix specs
fix users update service
update initializers
refactor services to match EE signature
Change recommended MySQL version to 5.6
Clarify artifact download via the API only accepts branch or tag name for ref
Clean merge_jid whenever necessary on the merge process
Rolling back change to n+1 detection
Breadcrumbs receives padding when double lined
karma spec fixes
Add EEP to headings
Added some Gitaly docs to `docs/development`
Check orientation of profile image
Fixed missing namespaces on navigation translations
...
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a13ab3e3305..a11190069ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -512,10 +512,10 @@ GEM omniauth-oauth2 (~> 1.1) omniauth-authentiq (0.3.1) omniauth-oauth2 (~> 1.3, >= 1.3.1) - omniauth-azure-oauth2 (0.0.6) + omniauth-azure-oauth2 (0.0.9) jwt (~> 1.0) omniauth (~> 1.0) - omniauth-oauth2 (~> 1.1) + omniauth-oauth2 (~> 1.4) omniauth-cas3 (1.1.4) addressable (~> 2.3) nokogiri (~> 1.7, >= 1.7.1) @@ -541,7 +541,7 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.3.1) + omniauth-oauth2 (1.4.0) oauth2 (~> 1.0) omniauth (~> 1.2) omniauth-oauth2-generic (0.2.2) @@ -1077,7 +1077,7 @@ DEPENDENCIES omniauth (~> 1.4.2) omniauth-auth0 (~> 1.4.1) omniauth-authentiq (~> 0.3.1) - omniauth-azure-oauth2 (~> 0.0.6) + omniauth-azure-oauth2 (~> 0.0.9) omniauth-cas3 (~> 1.1.4) omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.1.1) |