Commits · 3ca1f6d02827e5248cfe71a973f1d84acbeede7b · nexedi / gitlab-ce

08 Jun, 2017 37 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-06-07 · 3ca1f6d0
  Nick Thomas authored Jun 08, 2017
  
  3ca1f6d0
- Merge branch 'docs/rm-protected-branches-ee' into 'master' · dbc7bbc3
  Sean Packham authored Jun 08, 2017
```
Add docs for protected branches deletion feature

Closes gitlab-ce#32218

See merge request !2086
```
  dbc7bbc3
- Merge branch 'docs/triggers' into 'master' · 910a523c
  Sean Packham authored Jun 08, 2017
```
Refactor CI triggers docs

Closes #2616

See merge request !2079
```
  910a523c
- Merge branch 'docs/shared-runners-ee' into 'master' · 5b15fe7c
  Sean Packham authored Jun 08, 2017
```
Refactor Runners docs

See merge request !2061
```
  5b15fe7c
- Merge branch 'revert-related-issues-backend' into 'master' · 6b930bd2
  Sean McGivern authored Jun 08, 2017
```
Revert "Merge branch '2001-related-issues' into 'master'"

See merge request !2082
```
  6b930bd2
- Merge branch 'sync-email-from-omniauth-ee' into 'master' · 6f8b7545
  Douwe Maan authored Jun 08, 2017
```
Sync email address from specified omniauth provider [EE]

See merge request !2072
```
  6f8b7545
- Merge branch 'bvl-port-project-translations-to-ee' into 'master' · 1d3405dd
  Douwe Maan authored Jun 08, 2017
```
Port project translations from CE to EE

See merge request !2066
```
  1d3405dd
- Add docs for protected branches deletion feature · 308dc734
  Achilleas Pipinellis authored May 19, 2017
```
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/32218
```
  308dc734
- Merge branch 'fix/audit-logs-flaky-spec' into 'master' · c121775c
  Sean McGivern authored Jun 08, 2017
```
Fix audit logs spec failing on master

See merge request !2069
```
  c121775c
- Revert "Merge branch '2001-related-issues' into 'master'" · 83b7702b
  Sean McGivern authored Jun 08, 2017
```
This reverts commit b34bc6fe, reversing
changes made to e9fcae37.
```
  83b7702b
- Fix the EnsureProjectMirrorData post migration · 4471ca45
  Nick Thomas authored Jun 08, 2017
  
  4471ca45
- Refactor CI triggers docs · 6c3ff26e
  Achilleas Pipinellis authored Jun 08, 2017
  
  6c3ff26e
- Fix a reference to a renamed file introduced in the ce->ee merge · 62ff363c
  Nick Thomas authored Jun 08, 2017
  
  62ff363c
- Mock the correct `external_email` method. · 8ad86cc9
  Bob Van Landuyt authored Jun 08, 2017
  
  8ad86cc9
- Add stub_omniauth_setting · c8b11b0c
  Douwe Maan authored Jun 07, 2017
  
  c8b11b0c
- User#ldap_email? is gone · 9c972754
  Douwe Maan authored Jun 07, 2017
  
  9c972754
- Sync email address from specified omniauth provider · ce24035d
  Robin Bobbitt authored Jun 06, 2017
  
  ce24035d
- Sync email address from specified omniauth provider - db changes · 5ba3a3f2
  Robin Bobbitt authored Jun 06, 2017
  
  5ba3a3f2
- Fix a bad merge in app/services/ci/create_pipeline_service.rb · 1c2d46ca
  Nick Thomas authored Jun 08, 2017
  
  1c2d46ca
- Remove trailing line in git_http_spec.rb · 379ca831
  Nick Thomas authored Jun 08, 2017
  
  379ca831
- Fix a spec failure caused by extra factories in EE · 722585a9
  Nick Thomas authored Jun 08, 2017
  
  722585a9
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-06-07 · 0a6041d6
  Nick Thomas authored Jun 08, 2017
  
  0a6041d6
- Fix specs to expect new CE strings that haven't made it to EE yet · b2eae552
  Douwe Maan authored Jun 07, 2017
  
  b2eae552
- Port translations from CE to EE · 7bb826fe
  Bob Van Landuyt authored Jun 07, 2017
  
  7bb826fe
- fix spec random failures · a5af32ed
  James Lopez authored Jun 07, 2017
  
  a5af32ed
- Merge branch 'zj-object-store-artifacts' into 'master' · 7390772c
  Grzegorz Bizon authored Jun 08, 2017
```
Object store for artifacts

Closes gitlab-ce#29203

See merge request !1762
```
  7390772c
- Merge branch '2337-fix-external-users-elasticsearch' into 'security-9-1-ee' · df0b99e2
  Sean McGivern authored May 10, 2017
```
Respect the external user setting in elasticsearch

See merge request !512
```
  df0b99e2
- Merge remote-tracking branch 'gl-dev/master' · 86051969
  Regis authored Jun 07, 2017
  
  86051969
- Fix a bad merge in app/policies/group_policy.rb · a0acaf16
  Nick Thomas authored Jun 08, 2017
  
  a0acaf16
- Fix conflicts in git / wiki access · 7f8682d9
  Nick Thomas authored Jun 08, 2017
  
  7f8682d9
- Fix merge conflicts in WikiPages::{Create,Destroy,Update}Service specs · 3275a767
  Nick Thomas authored Jun 08, 2017
  
  3275a767
- Fix merge conflict in Ci::CreatePipelineService · bd71a053
  Nick Thomas authored Jun 08, 2017
  
  bd71a053
- Merge branch 'master' into ce-to-ee-2017-06-07 · bde12f75
  Nick Thomas authored Jun 08, 2017
  
  bde12f75
- Merge branch 'mk-fix-git-over-http-rejections-ee' into 'master' · e7f76734
  Douwe Maan authored Jun 08, 2017
```
Port of mk-fix-git-over-http-rejections to EE

See merge request !2062
```
  e7f76734
- Merge branch '2384-geo-event-log' into 'master' · 9100ee60
  Robert Speicher authored Jun 08, 2017
```
Add push events to Geo event log

Closes #2384

See merge request !1976
```
  9100ee60
- Merge branch 'mk-link-properly-in-docs' into 'master' · 0716348d
  Douwe Maan authored Jun 08, 2017
```
Improve “How to go back to using the `authorized_keys` file” section in docs

See merge request !2076
```
  0716348d
- Merge branch 'improve-form-spec-ee' into 'master' · aeb79bc7
  Douwe Maan authored Jun 08, 2017
```
Improve form spec (EE)

See merge request !2067
```
  aeb79bc7
07 Jun, 2017 3 commits
- Improve “How to go back to `authorized_keys`” docs · 981d3869
  Michael Kozono authored Jun 07, 2017
  
  981d3869
- Merge branch 'bvl-ldap-find-user-by-email' into 'master' · 65c3b156
  Douwe Maan authored Jun 07, 2017
```
Find a user by email from LDAP

Closes gitlab-ce#22924 and #2522

See merge request !2003
```
  65c3b156
- Find a user by email from LDAP · 14f0aa51
  Bob Van Landuyt authored Jun 07, 2017
  
  14f0aa51