Commits · c67c4fb1ff0fa878f30bbb8c99a8b59c7c770a9e · nexedi / gitlab-ce

27 Jun, 2017 9 commits
- Merge branch 'docs/add-overview-features-1' into 'master' · c67c4fb1
  Achilleas Pipinellis authored Jun 27, 2017
```
Add overview and use-cases to EE features

See merge request !2236
```
  c67c4fb1
- Update repo mirroring docs · fbce27d1
  Achilleas Pipinellis authored Jun 27, 2017
  
  fbce27d1
- Update webhooks docs · 8bb39137
  Achilleas Pipinellis authored Jun 27, 2017
  
  8bb39137
- Update file locking docs · 658b8eb5
  Achilleas Pipinellis authored Jun 27, 2017
  
  658b8eb5
- Update Email from GitLab docs · 99b500f3
  Achilleas Pipinellis authored Jun 27, 2017
  
  99b500f3
- Update Kerberos docs · 0b69cf72
  Achilleas Pipinellis authored Jun 27, 2017
  
  0b69cf72
- Update Audit events docs · 1070b8c2
  Achilleas Pipinellis authored Jun 27, 2017
  
  1070b8c2
- Update Contribution Analytics docs · c01b3976
  Achilleas Pipinellis authored Jun 27, 2017
  
  c01b3976
- Merge branch 'sh-disable-route-saving-for-geo-secondary' into 'master' · ad8e7eb1
  Douwe Maan authored Jun 27, 2017
```
Don't attempt to save a new route on Geo secondary

Closes #2743

See merge request !2260
```
  ad8e7eb1
26 Jun, 2017 22 commits
- Don't attempt to save a new route on Geo secondary · 090651f0
  Stan Hu authored Jun 26, 2017
```
The lazy initializer doesn't work on Geo for projects that have not
yet been visited. Geo would fail to sync projects that had this issue.

Closes #2743
```
  090651f0
- Merge branch 'sh-geo-add-project-deletion-events' into 'master' · 1496e092
  Douwe Maan authored Jun 26, 2017
```
Add Geo delete event log

See merge request !2126
```
  1496e092
- Merge branch 'winh-test-bundle-duplicate-vue-imports' into 'master' · 19f7ad89
  Clement Ho authored Jun 26, 2017
```
Remove duplicate Vue import from test_bundle.js

See merge request !2258
```
  19f7ad89
- Merge branch 'dm-revert-authorized-files-toggle-master' into 'master' · fce9c01b
  Robert Speicher authored Jun 26, 2017
```
Revert "Merge branch 'mk-toggle-writing-to-auth-keys-1631' into 'master'"

See merge request !2257
```
  fce9c01b
- Merge branch 'sh-disable-geo-primary-system-hook' into 'master' · b1003408
  Robert Speicher authored Jun 26, 2017
```
Delete primary Geo system hook

Closes #1752

See merge request !1679
```
  b1003408
- Revert StubENV patch to see if the build failure happens again · faf1e349
  Stan Hu authored Jun 26, 2017
  
  faf1e349
- Remove duplicate Vue import from test_bundle.js · f477e89e
  winh authored Jun 26, 2017
  
  f477e89e
- Revert "Merge branch 'mk-toggle-writing-to-auth-keys-1631' into 'master'" · 9f867546
  Douwe Maan authored Jun 26, 2017
```
This reverts commit e5669cb2, reversing
changes made to 3f42b5d8.

# Conflicts:
#	doc/administration/operations/speed_up_ssh.md

# Conflicts:
#	doc/administration/operations/speed_up_ssh.md
```
  9f867546
- Merge branch '2467-geo-implement-consumer-aka-geologcursor-for-event-log' into 'master' · 9188a762
  Douwe Maan authored Jun 26, 2017
```
Geo: Implement GeoLogCursor for event log

Closes #2467

See merge request !1988
```
  9188a762
- Update CHANGELOG-EE.md for 9.3.0-ee · 221ab608
  Clement Ho authored Jun 22, 2017
```
[ci skip]
```
  221ab608
- Merge branch 'winh-karma-suppress-vue-tips-ee' into 'master' · ceb63966
  Clement Ho authored Jun 26, 2017
```
Suppress Vue tips when running Karma

See merge request !2237
```
  ceb63966
- When we can't renew exclusive lease we should exit the loop · d50ae9fc
  Gabriel Mazetto authored Jun 24, 2017
  
  d50ae9fc
- Use an ExclusiveLease to prevent multiple instances of LogCursor to run · bf98a0f1
  Gabriel Mazetto authored Jun 23, 2017
  
  bf98a0f1
- Introduce #renew for ExclusiveLease · d08b3f75
  Gabriel Mazetto authored Jun 23, 2017
  
  d08b3f75
- Fix specs and factories · a43a605b
  Gabriel Mazetto authored Jun 17, 2017
  
  a43a605b
- Validate presence of Geo::EventLogState#event_id · 5da5ed42
  Douglas Barbosa Alexandre authored Jun 13, 2017
  
  5da5ed42
- Use 8 bytes value for event_id column on the geo_event_log_state table · c57f9dfb
  Douglas Barbosa Alexandre authored Jun 13, 2017
  
  c57f9dfb
- GeoLogCursor processing repository_update events for repos and wiki. · 1679c570
  Gabriel Mazetto authored May 29, 2017
  
  1679c570
- Merge branch 'feature/add-new-services-ee' into 'master' · 8ef83018
  Sean McGivern authored Jun 26, 2017
```
Port: Add additional user and email services from CE

See merge request !2232
```
  8ef83018
- Merge branch 'ee-33223-multiple-tooltips-on-the-same-vue-component' into 'master' · ae917533
  Phil Hughes authored Jun 26, 2017
```
Add support for multiple tooltips in the same Vue component -- EE merge edition

Closes gitlab-ce#33223

See merge request !2051
```
  ae917533
- Add support for multiple tooltips in the same Vue component -- EE merge edition · 1767e592
  Eric Eastwood authored Jun 26, 2017
  
  1767e592
- Merge branch 'ce-to-ee' into 'master' · 9e7002c9
  Dmitriy Zaporozhets authored Jun 26, 2017
```
CE Upstream - Monday

See merge request !2244
```
  9e7002c9
25 Jun, 2017 5 commits
- Remove trasnaction when update_column_in_batches is used · fefa5515
  Dmitriy Zaporozhets authored Jun 25, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fefa5515
- Disable ddl transactions for 20160831231325_update_mirror_when_empty_import_url_in_projects.rb · a51ca2a4
  Dmitriy Zaporozhets authored Jun 25, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a51ca2a4
- Limit group title spec for subgroups with postgres only · c6b311a9
  Dmitriy Zaporozhets authored Jun 25, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c6b311a9
- Merge remote-tracking branch 'ce-com/master' into ce-to-ee · 6c8d2b99
  Dmitriy Zaporozhets authored Jun 25, 2017
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6c8d2b99
- fix spec failures · 6891829f
  James Lopez authored Jun 25, 2017
  
  6891829f
24 Jun, 2017 4 commits
- Revert changes until gitlab-org/gitlab-ce!12435 is merged · a07c013e
  Stan Hu authored Jun 24, 2017
  
  a07c013e
- Merge branch '34264-replace-settings-ci-cd-pipelines-with-settings-pipelines-in-docs' into 'master' · f0886918
  Marcia Ramos authored Jun 24, 2017
```
Resolve "Replace 'Settings ➔ CI/CD Pipelines' with 'Settings ➔ Pipelines' in docs"

Closes #34264

See merge request !12433
```
  f0886918
- Merge branch 'fix-profile-show-interpolation' into 'master' · 98b94cbf
  Phil Hughes authored Jun 24, 2017
```
Fix interpolation in app/views/profile/show.html/haml

See merge request !12439
```
  98b94cbf
- Fix interpolation in app/views/profile/show.html/haml · b7e6fb9b
  Nick Thomas authored Jun 24, 2017
  
  b7e6fb9b