Commits · 2c7095c839800d6f11a9c259f590d93911b1bba6 · nexedi / gitlab-ce

22 May, 2018 11 commits
- Merge branch 'ab-43706-composite-primary-keys' into 'master' · 2c7095c8
  Yorick Peterse authored May 22, 2018
```
Migration to add primary key constraint for composite keys

Closes #43706 and #32258

See merge request gitlab-org/gitlab-ce!18980
```
  2c7095c8
- Merge branch '45827-expose_readme_url_in_project_api' into 'master' · 360ec74c
  Rémy Coutable authored May 22, 2018
```
Expose readme url in Project API

Closes #45827

See merge request gitlab-org/gitlab-ce!18960
```
  360ec74c
- Expose readme url in Project API · 10237d45
  Imre Farkas authored May 22, 2018
  
  10237d45
- Merge branch 'rename-merge-request-widget-author-component' into 'master' · 4d674bd3
  Phil Hughes authored May 22, 2018
```
Rename merge request widget author component

See merge request gitlab-org/gitlab-ce!19079
```
  4d674bd3
- Merge branch 'fj-46411-fix-badge-api-endpoint-route-with-relative-url' into 'master' · 879ddf72
  Douwe Maan authored May 22, 2018
```
Fixed badge api endpoint route when relative_url is set

Closes #46411

See merge request gitlab-org/gitlab-ce!19004
```
  879ddf72
- Merge branch 'jira-clarify-docs' into 'master' · 8f159d92
  Achilleas Pipinellis authored May 22, 2018
```
Clarifying Jira documentaiton

See merge request gitlab-org/gitlab-ce!19046
```
  8f159d92
- Clarifying Jira documentaiton · 2abb06bc
  Aric Buerer authored May 22, 2018
  
  2abb06bc
- Merge branch 'fj-46459-fix-expose-url-when-base-url-set' into 'master' · 67a12690
  Douwe Maan authored May 22, 2018
```
Fix `expose_url` helper does not include custom base url if it is set

Closes #46459

See merge request gitlab-org/gitlab-ce!19003
```
  67a12690
- Fix `expose_url` helper does not include custom base url if it is set · 0af4c56c
  Francisco Javier López authored May 22, 2018
  
  0af4c56c
- Rename merge request widget author component · 385c0779
  George Tsiolis authored May 22, 2018
  
  385c0779
- Merge branch '45532-upgrade-vue-loader' into 'master' · 73572761
  Phil Hughes authored May 22, 2018
```
Resolve "Upgrade vue-loader for bug fixes and a simpler webpack config"

Closes #45532

See merge request gitlab-org/gitlab-ce!19052
```
  73572761
21 May, 2018 29 commits
- Update VERSION to 11.0.0-pre · c6f72ac9
  Mayra Cabrera authored May 21, 2018
  
  c6f72ac9
- Merge branch 'collapsed-contextual-nav-update' into 'master' · 54a64133
  Tim Zallmann authored May 21, 2018
```
Renamed 'Overview' to 'Project' in collapsed contextual navigation at a project level

See merge request gitlab-org/gitlab-ce!18996
```
  54a64133
- Renamed 'Overview' to 'Project' in collapsed contextual navigation at a project level · 3503dfe2
  Constance Okoghenun authored May 21, 2018
  
  3503dfe2
- Update VERSION to 10.9.0-pre · 87d2c77b
  Mayra Cabrera authored May 21, 2018
  
  87d2c77b
- Update CHANGELOG.md for 10.8.0 · 1c23c3ff
  Mayra Cabrera authored May 21, 2018
```
[ci skip]
```
  1c23c3ff
- Migration to add/drop primary key constraints for composite keys. · 82576518
  Andreas Brandl authored May 15, 2018
```
Closes #43706.
```
  82576518
- Add NOT NULL constraints to project_authorizations. · a0c79f9d
  Andreas Brandl authored May 17, 2018
```
Closes #32258.
```
  a0c79f9d
- 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 '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 '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
- 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 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
- Add test for the cancelled jobs · b053c483
  Shinya Maeda authored May 21, 2018
  
  b053c483
- 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
- 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 '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