Commits · 89d997230bbe157d67249afcb2814fe6c86460cc · nexedi / gitlab-ce

23 Mar, 2018 40 commits
- Merge branch '4994-geo-log-jid-for-sync-related-jobs' into 'master' · 89d99723
  Stan Hu authored Mar 23, 2018
```
Resolve "[Geo] Log JID for sync related jobs"

Closes #4994

See merge request gitlab-org/gitlab-ee!5007
```
  89d99723
- [Geo] Log Sidekiq context for sync related jobs · fe1625bb
  Valery Sizov authored Mar 17, 2018
  
  fe1625bb
- Merge branch 'mk/geo/mark-disabled-wikis-as-synced' into 'master' · 73d1fab8
  Stan Hu authored Mar 23, 2018
```
Geo: Remove disabled wikis from out-of-sync queries

Closes #5361

See merge request gitlab-org/gitlab-ee!5089
```
  73d1fab8
- Remove disabled wikis from out-of-sync queries · f49570aa
  Michael Kozono authored Mar 22, 2018
  
  f49570aa
- Merge branch... · 4dfeb060
  Clement Ho authored Mar 23, 2018
```
Merge branch 'ee-leipert-42037-long-instance-names-group-names-covers-namespace-dropdown' into 'master'

projects.scss: Fix deviation from CE and move EE only features to EE scss file.

See merge request gitlab-org/gitlab-ee!5046
```
  4dfeb060
- projects.scss: Fix deviation from CE and move EE only features to EE scss file. · 7409cd53
  Lukas Eipert authored Mar 23, 2018
  
  7409cd53
- Merge branch 'ee-44589-problem-with-prettier-setting-trailingcomma-all' into 'master' · c63e6801
  Filipa Lacerda authored Mar 23, 2018
```
Port of Resolve "Problem with prettier setting trailingComma: all" to EE

See merge request gitlab-org/gitlab-ee!5101
```
  c63e6801
- Merge branch 'ce-to-ee-2018-03-23' into 'master' · eedc383f
  Robert Speicher authored Mar 23, 2018
```
CE upstream - 2018-03-23 06:25 UTC

Closes charts/helm.gitlab.io#291 and gitlab-ce#43937

See merge request gitlab-org/gitlab-ee!5093
```
  eedc383f
- Merge branch '5178-geo-verification-rename-log' into 'master' · 7f6a9245
  Stan Hu authored Mar 23, 2018
```
Use geo.log for secondary repository verification logging

Closes #5178

See merge request gitlab-org/gitlab-ee!5095
```
  7f6a9245
- Use geo.log for secondary repository verification logging · 00d231c4
  Brett Walker authored Mar 23, 2018
  
  00d231c4
- ensure stylesheets are included as well, make prettierrc even more inclusive · 72da358e
  Mike Greiling authored Mar 23, 2018
  
  72da358e
- make babel-transpiled overrides more inclusive · d94ba204
  Mike Greiling authored Mar 23, 2018
  
  d94ba204
- update eslintignore for node scripts · 9eb4d935
  Mike Greiling authored Mar 23, 2018
  
  9eb4d935
- prettify all node scripts · eaa00b24
  Mike Greiling authored Mar 23, 2018
  
  eaa00b24
- ignore generated locale files with prettier · 208e9ef8
  Mike Greiling authored Mar 23, 2018
  
  208e9ef8
- update prettier config to differentiate node scripts from babel compiled modules · 6c1951b4
  Mike Greiling authored Mar 23, 2018
  
  6c1951b4
- Merge branch 'docs/gitlab-com-settings-ee' into 'master' · c2cb9a3d
  Marcia Ramos authored Mar 23, 2018
```
Move GitLab.com settings under main docs

See merge request gitlab-org/gitlab-ee!5099
```
  c2cb9a3d
- Move GitLab.com settings under main docs · 20fcf47d
  Achilleas Pipinellis authored Mar 23, 2018
  
  20fcf47d
- Merge branch '5105_split_dependency_scanning_from_sast' into 'master' · c8c88126
  Dmitriy Zaporozhets authored Mar 23, 2018
```
Add Dependency Scanning feature and expose its artifacts in Merge Request

See merge request gitlab-org/gitlab-ee!5051
```
  c8c88126
- Merge branch 'sh-add-geo-db-rollback-test' into 'master' · 1c21d6d1
  Robert Speicher authored Mar 23, 2018
```
Add Geo tracking DB rollback CI step

See merge request gitlab-org/gitlab-ee!5090
```
  1c21d6d1
- Merge branch 'webpack-config-fix' into 'master' · 67b2f2cd
  Filipa Lacerda authored Mar 23, 2018
```
Remove trailinng comma in webpack config

See merge request gitlab-org/gitlab-ee!5098
```
  67b2f2cd
- Resolve conflicts · 0c15388b
  Robert Speicher authored Mar 23, 2018
  
  0c15388b
- Merge branch '5178-geo-verification-repository-path-cleanup' into 'master' · 42f550e4
  Nick Thomas authored Mar 23, 2018
```
Geo - Cleanup repository path implementation

Closes #5178

See merge request gitlab-org/gitlab-ee!5082
```
  42f550e4
- Merge branch 'tz-ee-prettier-print-width-100' into 'master' · 82cd5c4a
  Clement Ho authored Mar 23, 2018
```
Updated Prettier Print Width to 100

See merge request gitlab-org/gitlab-ee!5096
```
  82cd5c4a
- Remove trailinng comma in webpack config · ceb671b7
  Phil Hughes authored Mar 23, 2018
  
  ceb671b7
- Resolve conflict in app/views/projects/branches/_branch.html.haml · 2d2c0fbb
  Toon Claes authored Mar 23, 2018
  
  2d2c0fbb
- Resolve conflict in app/views/layouts/_page.html.haml · e8d70ec6
  Toon Claes authored Mar 23, 2018
  
  e8d70ec6
- Merge branch 'ee-43771-improve-avatar-error-message' into 'master' · 7af2a91b
  Sean McGivern authored Mar 23, 2018
```
Change avatar error message to include allowed file formats

See merge request gitlab-org/gitlab-ee!5094
```
  7af2a91b
- Merge branch 'add-geo-temporary-to-docs' into 'master' · 5b16f761
  Achilleas Pipinellis authored Mar 23, 2018
```
Geo: Document @geo-temporary directory

Closes #5349

See merge request gitlab-org/gitlab-ee!5080
```
  5b16f761
- Geo: Document @geo-temporary directory · 2c803f84
  Valery Sizov authored Mar 23, 2018
  
  2c803f84
- Updated Prettier Print Width to 100 · bf8a95dd
  Tim Zallmann authored Mar 23, 2018
  
  bf8a95dd
- Change avatar error message to include allowed file formats · 57eb1ef6
  Fabian Schneider authored Mar 11, 2018
  
  57eb1ef6
- Merge branch 'ee-mark-legacy-git-access' into 'master' · 2e8135d0
  Sean McGivern authored Mar 23, 2018
```
Route path lookups through legacy_disk_path (EE version)

See merge request gitlab-org/gitlab-ee!5037
```
  2e8135d0
- Route path lookups through legacy_disk_path (EE version) · f4eb9901
  Jacob Vosmaer (GitLab) authored Mar 23, 2018
  
  f4eb9901
- Merge branch 'winh-deprecate-old-modal-ee' into 'master' · 2e39235a
  Filipa Lacerda authored Mar 23, 2018
```
Rename modal.vue to deprecated_modal.vue (EE port)

See merge request gitlab-org/gitlab-ee!5087
```
  2e39235a
- Rename modal.vue to deprecated_modal.vue (EE port) · 8bd98e65
  Winnie Hellmann authored Mar 23, 2018
  
  8bd98e65
- Merge branch 'ee-44386-better-ux-for-long-name-branches' into 'master' · 22b1af59
  Phil Hughes authored Mar 23, 2018
```
EE port of UX re-design branch items with flexbox

See merge request gitlab-org/gitlab-ee!5021
```
  22b1af59
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-23 · c9330f1c
  GitLab Bot authored Mar 23, 2018
```
# Conflicts:
#	app/assets/javascripts/boards/components/issue_card_inner.js
#	app/views/layouts/_page.html.haml
#	app/views/projects/branches/_branch.html.haml
#	config/webpack.config.js

[ci skip]
```
  c9330f1c
- Merge branch 'tc-re-add-read-only-banner' into 'master' · 453b5c1c
  Stan Hu authored Mar 23, 2018
```
Add read-only banner to all pages

Closes #43937

See merge request gitlab-org/gitlab-ce!17798
```
  453b5c1c
- Merge branch 'tc-re-add-read-only-banner-ee' into 'master' · 2686c97d
  Stan Hu authored Mar 23, 2018
```
EE Add read-only banner to all pages

See merge request gitlab-org/gitlab-ee!5000
```
  2686c97d