Commits · 16eb560738c500abe367a372eff780c310da8d38 · nexedi / gitlab-ce

23 Apr, 2018 5 commits
- Merge branch 'ee-dz-add-2fa-filter-admin-api' into 'master' · 16eb5607
  Douwe Maan authored Apr 23, 2018
```
Add 2FA filter to users API for admins only

See merge request gitlab-org/gitlab-ee!5435
```
  16eb5607
- Add 2FA filter to users API for admins only · 3954d45f
  Dmitriy Zaporozhets authored Apr 20, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3954d45f
- Merge branch 'jr-44157-remove-beta-docs' into 'master' · 63b15013
  Tim Zallmann authored Apr 23, 2018
```
Remove Web IDE feature flag from docs

See merge request gitlab-org/gitlab-ee!5448
```
  63b15013
- Remove Web IDE feature flag from docs · d3ae40e2
  James Ramsay authored Apr 23, 2018
  
  d3ae40e2
- Merge branch 'ce-to-ee-2018-04-22' into 'master' · 00d5f206
  Stan Hu authored Apr 23, 2018
```
CE upstream - 2018-04-22 18:22 UTC

See merge request gitlab-org/gitlab-ee!5446
```
  00d5f206
22 Apr, 2018 3 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-22 · ebe8021a
  GitLab Bot authored Apr 22, 2018
  
  ebe8021a
- Merge branch '45625-job-log-shows-no-job-log' into 'master' · c212908a
  Grzegorz Bizon authored Apr 22, 2018
```
Removes  'Job log message' from build trace

Closes #45625

See merge request gitlab-org/gitlab-ce!18523
```
  c212908a
- Removes 'no job log' from trace action · 3327bf62
  Mayra Cabrera authored Apr 22, 2018
```
'No job log' message is no longer necessary since we returned an image
when a build does not have a trace. See
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18278 for more
details

Closes #45625
```
  3327bf62
21 Apr, 2018 3 commits
- Merge branch 'ce-to-ee-2018-04-20' into 'master' · 54d9b138
  Stan Hu authored Apr 21, 2018
```
CE upstream - 2018-04-20 21:24 UTC

See merge request gitlab-org/gitlab-ee!5444
```
  54d9b138
- Resolve conflicts in app/models/milestone.rb · 6339afc7
  Stan Hu authored Apr 20, 2018
  
  6339afc7
- Resolve conflicts in db/schema.rb · ad60cd07
  Stan Hu authored Apr 20, 2018
  
  ad60cd07
20 Apr, 2018 29 commits
- Merge branch '5181-sync-repack' into 'master' · 243d6882
  Nick Thomas authored Apr 20, 2018
```
"Geo: schedule a git repack after initial clone"

Closes #5181

See merge request gitlab-org/gitlab-ee!5261
```
  243d6882
- "Geo: schedule a git repack after initial clone" · f6875b16
  Gabriel Mazetto authored Apr 20, 2018
  
  f6875b16
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-20 · 706951e8
  GitLab Bot authored Apr 20, 2018
```
# Conflicts:
#	app/models/milestone.rb
#	db/schema.rb

[ci skip]
```
  706951e8
- It is stable since it works. · 20c28575
  Sid Sijbrandij authored Apr 20, 2018
  
  20c28575
- Merge branch 'jr-unprotect-limitation-docs' into 'master' · adb05e84
  Sid Sijbrandij authored Apr 20, 2018
```
Warn admin access level may be removed from protected branch levels

See merge request gitlab-org/gitlab-ee!5437
```
  adb05e84
- Merge branch '5697-background-verification-docs' into 'master' · aaa0df13
  Marcia Ramos authored Apr 20, 2018
```
Resolve "Document background verification"

Closes #5697

See merge request gitlab-org/gitlab-ee!5440
```
  aaa0df13
- Add docs for background verification · 1aa8b317
  Douglas Barbosa Alexandre authored Apr 20, 2018
  
  1aa8b317
- Merge branch 'ce-to-ee-2018-04-20' into 'master' · 9c86dd72
  Robert Speicher authored Apr 20, 2018
```
CE upstream - 2018-04-20 12:24 UTC

See merge request gitlab-org/gitlab-ee!5436
```
  9c86dd72
- Lock mysql image to 5.7 for `use-mysql-with-elasticsearch` · d14b14e8
  Robert Speicher authored Apr 20, 2018
  
  d14b14e8
- Merge branch 'leipert-dedupe-yarn-dependencies' into 'master' · ff778061
  Mike Greiling authored Apr 20, 2018
```
Dedupe yarn dependencies

See merge request gitlab-org/gitlab-ce!18477
```
  ff778061
- Dedupe yarn dependencies · 49518bc6
  Lukas Eipert authored Apr 20, 2018
  
  49518bc6
- Merge branch 'ee-leipert-dedupe-yarn-dependencies' into 'master' · 70f9a29d
  Mike Greiling authored Apr 20, 2018
```
EE port of "dedupe yarn dependencies"

See merge request gitlab-org/gitlab-ee!5426
```
  70f9a29d
- Merge branch 'sh-downgrade-mysql-ci' into 'master' · 8b40d733
  Robert Speicher authored Apr 20, 2018
```
Downgrade MySQL CI service from 8.0 to 5.7

Closes #45606

See merge request gitlab-org/gitlab-ce!18512
```
  8b40d733
- Merge branch 'sh-downgrade-mysql-ci' into 'master' · 3c3cab8b
  Robert Speicher authored Apr 20, 2018
```
Downgrade MySQL CI service from 8.0 to 5.7

Closes #45606

See merge request gitlab-org/gitlab-ce!18512
```
  3c3cab8b
- Merge branch 'docs-pages-update2' into 'master' · 751f947a
  Robert Speicher authored Apr 20, 2018
```
add restart of gitlab-pages to apply gitlab pages settings

See merge request gitlab-org/gitlab-ce!18455
```
  751f947a
- Fix conflict related to LfsFileLock block · a9fbbe82
  Rubén Dávila authored Apr 20, 2018
  
  a9fbbe82
- Resolve CHANGELOG.md by using CE's version · 84548ab3
  Robert Speicher authored Apr 20, 2018
```
[ci skip]
```
  84548ab3
- Downgrade MySQL CI service from 8.0 to 5.7 · cdb5f985
  Stan Hu authored Apr 20, 2018
```
MySQL 8.0 made the default authentication mode `caching_sha2_password`, and
this breaks our CI builds at the moment. Downgrade until we can figure
out how to support this.

Closes #45606
```
  cdb5f985
- Merge branch '5722-dr-manual-improvements-docs' into 'master' · d3f6078c
  Nick Thomas authored Apr 20, 2018
```
Resolve "Disaster Recovery doc: Promoted node -> Primary with Geo enabled is not clear"

Closes #5722

See merge request gitlab-org/gitlab-ee!5420
```
  d3f6078c
- CE->EE: Fix conflicts relating to project snapshots · b36b4f8c
  Nick Thomas authored Apr 20, 2018
  
  b36b4f8c
- Warn admin 60 may be removed from protected branch levels · 022bff80
  James Ramsay authored Apr 20, 2018
  
  022bff80
- Fix conflict: app/assets/javascripts/boards/models/list.js · ca8f95c2
  Felipe Artur authored Apr 20, 2018
  
  ca8f95c2
- Merge branch 'ab-44259-atomic-internal-ids-for-all-models' into 'master' · 7f8dc68c
  Yorick Peterse - OOO until May 4th authored Apr 20, 2018
```
Atomic internal ids for all models

Closes #44259

See merge request gitlab-org/gitlab-ce!18402
```
  7f8dc68c
- Atomic internal ids for all models · 9ea2fc85
  Andreas Brandl authored Apr 20, 2018
  
  9ea2fc85
- Merge branch 'ee-ab-44259-atomic-internal-ids-for-all-models' into 'master' · c298ceda
  Yorick Peterse authored Apr 20, 2018
```
EE-port for "Atomic internal ids for all models"

See merge request gitlab-org/gitlab-ee!5390
```
  c298ceda
- EE-port for "Atomic internal ids for all models" · 34cc18be
  Andreas Brandl authored Apr 20, 2018
  
  34cc18be
- Fix conflicts in db/schema.rb · 1d21ca57
  Sean McGivern authored Apr 20, 2018
  
  1d21ca57
- Fix conflicts in LICENSE · 8c7de34c
  Sean McGivern authored Apr 20, 2018
  
  8c7de34c
- Fix conflicts in issue models · 886e3327
  Sean McGivern authored Apr 20, 2018
  
  886e3327