Commits · ec1431eff71a212e4dfec397ff9c712935813b9c · nexedi / gitlab-ce

22 May, 2018 1 commit
- Regenerated locale/gitlab.pot · ec1431ef
  Lin Jen-Shin authored May 22, 2018
  
  ec1431ef
21 May, 2018 39 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-21 · 3d7d0006
  GitLab Bot authored May 21, 2018
```
# Conflicts:
#	locale/gitlab.pot

[ci skip]
```
  3d7d0006
- Merge branch 'ce-5928-geo-rake-task-to-force-housekeeping-on-next-sync' into 'master' · 7e78eacd
  Nick Thomas authored May 21, 2018
```
Backport from EE: Adding Progressbar explicitly and spec extensions for it

See merge request gitlab-org/gitlab-ce!18885
```
  7e78eacd
- Merge branch '5928-geo-rake-task-to-force-housekeeping-on-next-sync' into 'master' · bdefdb44
  Nick Thomas authored May 21, 2018
```
Resolve "Geo: Rake task to force housekeeping on next sync"

Closes #5928

See merge request gitlab-org/gitlab-ee!5623
```
  bdefdb44
- 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 '45746-fix-container-registry-typo' into 'master' · 1a748aa1
  Rémy Coutable authored May 21, 2018
```
Resolve "Registry page text is wrong and contains broken links."

Closes #45746

See merge request gitlab-org/gitlab-ce!18711
```
  1a748aa1
- 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
- Merge branch 'create-live-trace-only-if-job-is-complete' into 'master' · 592b8d71
  Kamil Trzciński authored May 21, 2018
```
Append trace chunk only if job is running

Closes #46383

See merge request gitlab-org/gitlab-ce!18969
```
  592b8d71
- Merge branch '45528-repeated-calls-to-redis-for-flipper-feature-flag' into 'master' · 09beebd7
  Stan Hu authored May 21, 2018
```
Resolve "Repeated calls to Redis for Flipper feature flag"

Closes #45528

See merge request gitlab-org/gitlab-ce!18490
```
  09beebd7
- Merge branch 'fix/gb/exclude-persisted-variables-from-environment-name' into 'master' · 723b2471
  Grzegorz Bizon authored May 21, 2018
```
Do not allow to use `CI_PIPELINE_ID` in environment name

Closes #46443

See merge request gitlab-org/gitlab-ce!19032
```
  723b2471
- Resolve conflict in spec/javascripts/environments/environments_app_spec.js · acd8fef8
  Rémy Coutable authored May 21, 2018
  
  acd8fef8
- Add changelog · c94b607a
  Shinya Maeda authored May 21, 2018
  
  c94b607a
- Merge branch 'add-broadcast-message-timezone-label' into 'master' · 7100f89f
  Kamil Trzciński authored May 21, 2018
```
Add timezone information to the datetime select labels

Closes #23389

See merge request gitlab-org/gitlab-ce!18987
```
  7100f89f
- Merge branch '46082-runner-contacted_at-is-not-always-a-time-type' into 'master' · 98b0ca62
  Kamil Trzciński authored May 21, 2018
```
Resolve "Runner#contacted_at is not always a Time type"

Closes #46082

See merge request gitlab-org/gitlab-ce!18810
```
  98b0ca62
- 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
- Add test for the cancelled jobs · b053c483
  Shinya Maeda authored May 21, 2018
  
  b053c483
- 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
- Add the same gurad clause with artifacts uplaoding · 5af5815d
  Shinya Maeda authored May 18, 2018
  
  5af5815d
- Append trace only if the job is running · 93349b44
  Shinya Maeda authored May 15, 2018
  
  93349b44
- 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