Commits · d86e27ee2e1b716eb2942668f58b8fce8127d2fe · nexedi / gitlab-ce

21 May, 2018 19 commits
- Merge branch 'ce-to-ee-2018-05-21' into 'master' · d86e27ee
  Rémy Coutable authored May 21, 2018
```
CE upstream - 2018-05-21 09:27 UTC

See merge request gitlab-org/gitlab-ee!5787
```
  d86e27ee
- Merge branch 'sh-exclude-pg-tables-from-fdw-check' into 'master' · b50d9d3a
  Nick Thomas authored May 21, 2018
```
Geo: Exclude tables that start with pg_ from FDW check

See merge request gitlab-org/gitlab-ee!5777
```
  b50d9d3a
- Update CHANGELOG.md for 10.7.4 · 42e4ef86
  Filipa Lacerda authored May 21, 2018
```
[ci skip]
```
  42e4ef86
- Update CHANGELOG-EE.md for 10.7.4-ee · 2e55383c
  Filipa Lacerda authored May 21, 2018
```
[ci skip]
```
  2e55383c
- Resolve conflicts in doc/api/merge_requests.md · 17255af2
  Mark Chao authored May 21, 2018
  
  17255af2
- Merge branch 'ee-5845-extract-ee-environments-files' into 'master' · 7bc15ee8
  Phil Hughes authored May 21, 2018
```
Replaces vue resource with axios for environments code

See merge request gitlab-org/gitlab-ee!5746
```
  7bc15ee8
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-21 · 29a52bf5
  GitLab Bot authored May 21, 2018
```
# Conflicts:
#	doc/api/merge_requests.md

[ci skip]
```
  29a52bf5
- Merge branch '44799-api-naming-issue-scope' into 'master' · 7381a33f
  Rémy Coutable authored May 21, 2018
```
Resolve "API naming for issue scope"

Closes #44799

See merge request gitlab-org/gitlab-ce!18935
```
  7381a33f
- Merge branch '44799-api-naming-issue-scope-ee' into 'master' · 0c38239c
  Rémy Coutable authored May 21, 2018
```
Resolve "API naming for issue scope"

See merge request gitlab-org/gitlab-ee!5762
```
  0c38239c
- Merge branch '45065-users-projects-json-sort' into 'master' · cf7f3606
  Rémy Coutable authored May 21, 2018
```
UsersController#projects.json sort order

Closes #45065

See merge request gitlab-org/gitlab-ce!18227
```
  cf7f3606
- Merge branch 'zj-workhorse-archive-mandatory' into 'master' · b113330f
  Grzegorz Bizon authored May 21, 2018
```
Move git archives downloading to Gitaly

See merge request gitlab-org/gitlab-ce!18990
```
  b113330f
- Merge branch 'fix-kube_client-proxy_url-exception' into 'master' · 33897970
  Grzegorz Bizon authored May 21, 2018
```
Rescue Kubeclient::HttpError when generating prometheus_client

See merge request gitlab-org/gitlab-ce!18989
```
  33897970
- Remove unnecessary `with` from `allow` · 197d3e69
  Shinya Maeda authored May 21, 2018
  
  197d3e69
- Add changelog · c5bce1dc
  Shinya Maeda authored May 17, 2018
  
  c5bce1dc
- Add spec for unathrozied proxy_url · f1b43c1e
  Shinya Maeda authored May 17, 2018
  
  f1b43c1e
- Rescue Kubeclient::HttpError when generating prometheus_client · c1e89492
  Shinya Maeda authored May 16, 2018
  
  c1e89492
- Geo: Exclude tables that start with pg_ from FDW check · 1227ce6d
  Stan Hu authored May 18, 2018
```
PostgreSQL-specific tables, such as `pg_stat_statements` and `pg_buffercache`,
aren't necessary for our FDW check to work and cause unnecessary confusion.
```
  1227ce6d
- Add created_by_me and assigned_to_me scopes · 67c1d8d1
  Mark Chao authored May 14, 2018
```
Deprecate corresponding dash versions created-by-me and assigned-to-me
```
  67c1d8d1
- Add created_by_me and assigned_to_me scopes · d839b880
  Mark Chao authored May 14, 2018
```
Deprecate corresponding dash versions created-by-me and assigned-to-me
```
  d839b880
19 May, 2018 7 commits
- Merge branch 'ce-to-ee-2018-05-19' into 'master' · 7701c4ba
  Stan Hu authored May 19, 2018
```
CE upstream - 2018-05-19 06:23 UTC

See merge request gitlab-org/gitlab-ee!5781
```
  7701c4ba
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-19 · 82904349
  GitLab Bot authored May 19, 2018
  
  82904349
- Merge branch 'xeodon/gitlab-ce-fix/45743-master-fix-gitaly-delete-refs' into 'master' · ad9e0091
  Grzegorz Bizon authored May 19, 2018
```
Fix error when deleting an empty list of refs

Closes #45743

See merge request gitlab-org/gitlab-ce!19053
```
  ad9e0091
- Merge branch 'ce-to-ee-2018-05-18' into 'master' · 9af1d758
  Stan Hu authored May 19, 2018
```
CE upstream - 2018-05-18 21:23 UTC

See merge request gitlab-org/gitlab-ee!5778
```
  9af1d758
- Fix error when deleting an empty list of refs · 100c687c
  Sergey Sinev authored Apr 25, 2018
```
Closes #45743
```
  100c687c
- Resolve conflicts in .flayignore · 2f9f7b96
  Stan Hu authored May 18, 2018
  
  2f9f7b96
- Merge branch '46498-do-not-modify-strings' into 'master' · 95dacabe
  Stan Hu authored May 19, 2018
```
Resolve "Blob#batch can't handle frozen string paths"

Closes #46498

See merge request gitlab-org/gitlab-ce!19039
```
  95dacabe
18 May, 2018 14 commits
- Order UsersController#projects.json by updated_at · d8a9bfb6
  Takuya Noguchi authored Apr 05, 2018
  
  d8a9bfb6
- Merge branch 'geo-prevent-removing-registry-records' into 'master' · 5a9ee3b0
  Stan Hu authored May 18, 2018
```
[Geo] Don't remove project registry records

See merge request gitlab-org/gitlab-ee!5768
```
  5a9ee3b0
- Merge branch 'docs/fix-chmod' into 'master' · c3a4f443
  Stan Hu authored May 18, 2018
```
Chmod 644 on offending files

See merge request gitlab-org/gitlab-ce!19051
```
  c3a4f443
- Merge branch 'docs/fix-chmod-ee' into 'master' · 7e551159
  Stan Hu authored May 18, 2018
```
Chmod 644 on offending files

See merge request gitlab-org/gitlab-ee!5774
```
  7e551159
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-18 · 256ddc7a
  GitLab Bot authored May 18, 2018
```
# Conflicts:
#	.flayignore

[ci skip]
```
  256ddc7a
- Merge branch 'fix-double-brackets-in-wiki-markdown' into 'master' · 2e350216
  Robert Speicher authored May 18, 2018
```
Fix double brackets being linkified in wiki markdown

See merge request gitlab-org/gitlab-ce!18524
```
  2e350216
- Fix double brackets being linkified in wiki markdown · 1b530f96
  Alex authored May 18, 2018
  
  1b530f96
- Merge branch 'fix/handle-large-commit-tag-message' into 'master' · 076ab2e8
  Robert Speicher authored May 18, 2018
```
Add handling for commit/tags with big messages

See merge request gitlab-org/gitlab-ce!17892
```
  076ab2e8
- Merge branch 'ce-to-ee-2018-05-18' into 'master' · 8cb1e6bb
  Robert Speicher authored May 18, 2018
```
CE upstream - 2018-05-18 18:28 UTC

Closes #5925 and gitaly#1105

See merge request gitlab-org/gitlab-ee!5775
```
  8cb1e6bb
- Add handling for commit/tags with big messages · 019f5e24
  Ahmad Sherif authored Mar 20, 2018
  
  019f5e24
- Resolve lib/gitlab/auth/ldap/access.rb · a7489f4a
  Robert Speicher authored May 18, 2018
  
  a7489f4a
- Merge branch 'gitaly-1182-search-by-content-name' into 'master' · ee59fdf5
  Robert Speicher authored May 18, 2018
```
Migrate Repo#search_by_{content,name}  to Gitaly

See merge request gitlab-org/gitlab-ce!18750
```
  ee59fdf5
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-18 · 7248ad97
  GitLab Bot authored May 18, 2018
```
# Conflicts:
#	lib/gitlab/auth/ldap/access.rb

[ci skip]
```
  7248ad97
- Merge branch 'update-cicd-icon' into 'master' · fa04ec11
  Mike Greiling authored May 18, 2018
```
Update CI/CD icon to be the rocket

Closes #46491

See merge request gitlab-org/gitlab-ce!19024
```
  fa04ec11