Commits · 3857ab253a47c5d26fdf05dc528f3a3f2cd65a88 · nexedi / gitlab-ce

21 May, 2018 35 commits
- Merge branch 'milestone-planning' into 'master' · 3857ab25
  🚄 Job van der Voort 🚀 authored May 21, 2018
```
add milestone planning to process doc

See merge request gitlab-org/gitlab-ee!5737
```
  3857ab25
- add milestone planning to process doc · 2caaece0
  Sarrah Vesselov authored May 21, 2018
  
  2caaece0
- Merge branch 'ce-to-ee-2018-05-21' into 'master' · f06748b9
  Rémy Coutable authored May 21, 2018
```
CE upstream - 2018-05-21 12:28 UTC

Closes gitlab-qa#247

See merge request gitlab-org/gitlab-ee!5788
```
  f06748b9
- Resolve conflict in spec/javascripts/environments/environments_app_spec.js · acd8fef8
  Rémy Coutable authored May 21, 2018
  
  acd8fef8
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-21 · 1e5f063d
  GitLab Bot authored May 21, 2018
```
# Conflicts:
#	spec/javascripts/environments/environments_app_spec.js

[ci skip]
```
  1e5f063d
- Merge branch '46454-wrong-value-in-ci-deploy-user' into 'master' · de3f89a4
  Kamil Trzciński authored May 21, 2018
```
Resolve "CI/CD jobs: Wrong value in env. variable CI_DEPLOY_USER using <gitlab-deploy-token> deploy token"

Closes #46454

See merge request gitlab-org/gitlab-ce!19047
```
  de3f89a4
- 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
- Merge branch 'jr-web-ide-shortcuts' into 'master' · d5159b9c
  Tim Zallmann authored May 21, 2018
```
Add web shortcut to docs and shortcut modal

Closes #46385

See merge request gitlab-org/gitlab-ce!19044
```
  d5159b9c
- Merge branch 'rc/improve-single-script-jobs-ci-config' into 'master' · 3834040a
  Grzegorz Bizon authored May 21, 2018
```
Improve the single-script jobs CI config

See merge request gitlab-org/gitlab-ce!19040
```
  3834040a
- Merge branch 'trigger-cng-image' into 'master' · d7b3eb3d
  Rémy Coutable authored May 21, 2018
```
Build cloud native images on tags

See merge request gitlab-org/gitlab-ce!19025
```
  d7b3eb3d
- Merge branch 'update-prometheus-ga-docs' into 'master' · 8e38ed8c
  Marcia Ramos 🚫 (OOO - back on May 23) authored May 21, 2018
```
Remove experiemental notes from Prometheus docs

See merge request gitlab-org/gitlab-ce!19056
```
  8e38ed8c
- Remove experiemental notes from Prometheus docs · e4ebee42
  Joshua Lambert authored May 21, 2018
  
  e4ebee42
- Merge branch 'qa-247-generate-key-in-the-tests' into 'master' · 04068880
  Grzegorz Bizon authored May 21, 2018
```
Generate the key while running the tests

Closes gitlab-qa#247

See merge request gitlab-org/gitlab-ce!19059
```
  04068880
- Update CHANGELOG.md for 10.7.4 · 3540254e
  Filipa Lacerda authored May 21, 2018
```
[ci skip]
```
  3540254e
- 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
- Improve the single-script jobs CI config · bc57a62a
  Rémy Coutable authored May 18, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  bc57a62a
- Merge branch '5845-extract-ee-environments-files' into 'master' · 7fa17ef6
  Phil Hughes authored May 21, 2018
```
Replaces vue resource with axios for environments code

See merge request gitlab-org/gitlab-ce!18950
```
  7fa17ef6
- 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
- Generate the key while running the tests · bc535d4f
  Lin Jen-Shin authored May 21, 2018
  
  bc535d4f
- 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 5 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