Commits · aaa98c7318a2303a67523243b2c1705b455d442b · nexedi / gitlab-ce

29 May, 2018 2 commits
- Merge branch '38919/wiki-empty-states' into 'master' · aaa98c73
  Phil Hughes authored May 29, 2018
```
Add helpful messages to empty wiki view

Closes #38919

See merge request gitlab-org/gitlab-ce!19007
```
  aaa98c73
- Add helpful messages to empty wiki view · 67199aed
  Paul Slaughter authored May 29, 2018
  
  67199aed
28 May, 2018 38 commits
- Merge branch 'docs/fix-contributing-broken-tag' into 'master' · 6e354cb6
  Rémy Coutable authored May 28, 2018
```
"Build" team is now "Distribution"

See merge request gitlab-org/gitlab-ce!19186
```
  6e354cb6
- Merge branch 'ab-45389-remove-double-checked-internal-id-generation' into 'master' · b7467908
  Yorick Peterse authored May 28, 2018
```
Remove double-checked internal id generation.

Closes #45389

See merge request gitlab-org/gitlab-ce!19181
```
  b7467908
- Merge branch 'ce-6225-unify-app-views-milestones' into 'master' · 47cd6a06
  Rémy Coutable authored May 28, 2018
```
CE:  Resolve "Extract EE specific files/lines for app/views/shared/milestones"

See merge request gitlab-org/gitlab-ce!19185
```
  47cd6a06
- Merge branch 'add-background-migration-to-fill-file-store' into 'master' · 8adf5395
  Kamil Trzciński authored May 28, 2018
```
Add background migration to fill file stores from `NULL`  to `1`

Closes #45337 and #45476

See merge request gitlab-org/gitlab-ce!18557
```
  8adf5395
- Merge branch '38479-rename-secret-variables-to-variables' into 'master' · 98b1d76c
  Kamil Trzciński authored May 28, 2018
```
Resolve "Rename "secret variables" to "variables""

See merge request gitlab-org/gitlab-ce!19103
```
  98b1d76c
- Resolve "Rename "secret variables" to "variables"" · 7f1b7152
  Fabio Busatto authored May 28, 2018
  
  7f1b7152
- Merge branch 'patch-28' into 'master' · bb88fb7e
  Kamil Trzciński authored May 28, 2018
```
Returns a correct TMP_UPLOAD_PATH to workhourse

Closes #46763

See merge request gitlab-org/gitlab-ce!19148
```
  bb88fb7e
- Merge branch 'leipert-forward-bootstrap4' into 'master' · 57838e33
  Filipa Lacerda authored May 28, 2018
```
Update bootstrap to 4.1.1

See merge request gitlab-org/gitlab-ce!19179
```
  57838e33
- "Build" team is now "Distribution" · 51ad2508
  Philippe Lafoucrière authored May 28, 2018
  
  51ad2508
- Merge branch 'docs/redirect-k8s-service-page' into 'master' · 65bfec65
  Marcia Ramos authored May 28, 2018
```
Deprecate the Kubernetes service docs

See merge request gitlab-org/gitlab-ce!18837
```
  65bfec65
- Bring changes from EE · 22eb7881
  Lin Jen-Shin authored May 28, 2018
  
  22eb7881
- Merge branch 'leipert-backport-bs4-merge-conflict' into 'master' · 71dea693
  Fatih Acet authored May 28, 2018
```
Backport of CE->EE merge conflict resolution

See merge request gitlab-org/gitlab-ce!19171
```
  71dea693
- Merge branch 'leipert-dedupe-yarn-2018-05-27' into 'master' · 8b278829
  Fatih Acet authored May 28, 2018
```
Dedupe yarn dependencies

See merge request gitlab-org/gitlab-ce!19173
```
  8b278829
- Dedupe yarn dependencies · 27c0bb33
  Lukas Eipert authored May 28, 2018
  
  27c0bb33
- Merge branch 'patch-23' into 'master' · 7c948e00
  Achilleas Pipinellis authored May 28, 2018
```
use postgres_role

See merge request gitlab-org/gitlab-ce!19000
```
  7c948e00
- Merge branch 'patch-22' into 'master' · 992ba636
  Achilleas Pipinellis authored May 28, 2018
```
cleanup application server setup

See merge request gitlab-org/gitlab-ce!18999
```
  992ba636
- cleanup application server setup · 049e4fe4
  Ben Bodenmiller authored May 28, 2018
  
  049e4fe4
- Add changelog · acdea516
  Shinya Maeda authored May 28, 2018
  
  acdea516
- Merge branch 'ignore-writing-trace-if-it-already-archived' into 'master' · 35a02dc3
  Kamil Trzciński authored May 28, 2018
```
Disallow updating job status if the job is not running

Closes #46383

See merge request gitlab-org/gitlab-ce!19101
```
  35a02dc3
- Remove double-checked internal id generation. · f2cc1169
  Andreas Brandl authored May 28, 2018
```
This was needed for a transition phase only. For details see #45389.

Closes #45389.
```
  f2cc1169
- Merge branch 'sh-fix-admin-page-counts-take-2' into 'master' · 265b1faf
  Yorick Peterse authored May 28, 2018
```
Fix fast admin counters not working when PostgreSQL has secondaries

Closes #46742

See merge request gitlab-org/gitlab-ce!19154
```
  265b1faf
- Merge branch 'gitaly-backup-restore-delete-repositories' into 'master' · 3ab38383
  Douwe Maan authored May 28, 2018
```
Use Gitaly's DeleteAllRepositories RPC during backup restore

Closes gitaly#1194

See merge request gitlab-org/gitlab-ce!19086
```
  3ab38383
- Use Gitaly's DeleteAllRepositories RPC during backup restore · b529d04b
  Jacob Vosmaer (GitLab) authored May 28, 2018
  
  b529d04b
- Merge branch 'bvl-add-username-to-terms-message' into 'master' · a45b9fc9
  Douwe Maan authored May 28, 2018
```
Add username to terms message in git and API calls

Closes #46649

See merge request gitlab-org/gitlab-ce!19126
```
  a45b9fc9
- Merge branch '46846-update-redis-namespace-to-1-6-0' into 'master' · 5f5fc69d
  Rémy Coutable authored May 28, 2018
```
Update redis-namespace to 1.6.0

Closes #46846

See merge request gitlab-org/gitlab-ce!19166
```
  5f5fc69d
- Merge branch '45190-create-notes-diff-files' into 'master' · 0a43b25c
  Douwe Maan authored May 28, 2018
```
Persist and use truncated note diffs instead requesting Gitaly in a N+1 manner on MR page

Closes #45190

See merge request gitlab-org/gitlab-ce!18991
```
  0a43b25c
- Merge branch 'zj-internal-repo-path' into 'master' · cfdd80ec
  Grzegorz Bizon authored May 28, 2018
```
Don't pass the repository path to Gitlab Shell

See merge request gitlab-org/gitlab-ce!19011
```
  cfdd80ec
- backport EE version of · 94235cbb
  Lukas Eipert authored May 27, 2018
```
`app/assets/javascripts/jobs/components/sidebar_details_block.vue` and run prettier
Squashed commits:
[4551a37adc] backport EE version of
`app/assets/javascripts/jobs/components/sidebar_details_block.vue`
```
  94235cbb
- Update bootstrap to 4.1.1 · c4044977
  Lukas Eipert authored May 28, 2018
  
  c4044977
- Remove disable_statement_timeout · fb77cd72
  Shinya Maeda authored May 22, 2018
  
  fb77cd72
- Remove Gitlab::BackgroundMigration exxxplicit namespaces from migration classes · 2eaef5b3
  Shinya Maeda authored May 22, 2018
  
  2eaef5b3
- Rename FillFileStoreUpload to FillStoreUpload · 321e580e
  Shinya Maeda authored May 18, 2018
  
  321e580e
- Add chnage log · 26b3816d
  Shinya Maeda authored Apr 27, 2018
  
  26b3816d
- Add spec for fill_file_store migration · a366fa09
  Shinya Maeda authored Apr 27, 2018
  
  a366fa09
- Fix schema and refactoring migration file · 4b85b4dc
  Shinya Maeda authored Apr 27, 2018
  
  4b85b4dc
- Remove legacy artifacts file_store migration · c0b4f8ac
  Shinya Maeda authored Apr 27, 2018
  
  c0b4f8ac
- Add background migration to fill file stores · 76f0d7fe
  Shinya Maeda authored Apr 24, 2018
  
  76f0d7fe
- Add changelog · 890f7f49
  Shinya Maeda authored May 28, 2018
  
  890f7f49