Commits · 7ef4c967505c16208e5e2037fdd6e819182ce30b · nexedi / gitlab-ce

29 Mar, 2019 1 commit

Merge branch 'docs-ci-intro-illustration' into 'master' · 7ef4c967

Mike Lewis authored Mar 29, 2019

Docs: Update CI/CD intro - workflow illustration

Closes #59108

See merge request gitlab-org/gitlab-ce!26733

7ef4c967

28 Mar, 2019 39 commits
- Merge branch '9420-truncate-long-tags' into 'master' · ee8f3d5c
  Mike Greiling authored Mar 28, 2019
```
Truncate long tags in runners table

See merge request gitlab-org/gitlab-ce!26666
```
  ee8f3d5c
- Truncate long tags in runners table · ab784ffa
  Sarah Groff Hennigh-Palermo authored Mar 28, 2019
  
  ab784ffa
- Merge branch 'ce-reduce-diff-with-ce-in-spec-helpers' into 'master' · 95cda2cf
  Lin Jen-Shin authored Mar 28, 2019
```
[CE] Reduce diff with EE in `spec/helpers`

Closes gitlab-ee#10143

See merge request gitlab-org/gitlab-ce!26706
```
  95cda2cf
- Merge branch 'related-mr-link-cutoff' into 'master' · a06f9a33
  Annabel Dunstone Gray authored Mar 28, 2019
```
Don't cutoff letters in MR and Issue links

See merge request gitlab-org/gitlab-ce!25910
```
  a06f9a33
- Don't cutoff letters in MR and Issue links · 15ddf993
  gfyoung authored Mar 28, 2019
  
  15ddf993
- [CE] Reduce the diff with EE in spec/helpers/projects_helper_spec.rb · f6aa22fc
  Rémy Coutable authored Mar 28, 2019
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  f6aa22fc
- [CE] Reduce the diff with EE in spec/helpers/merge_requests_helper_spec.rb · 0b804812
  Rémy Coutable authored Mar 28, 2019
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0b804812
- [CE] Reduce the diff with EE in spec/helpers/issuables_helper_spec.rb · dbe27cb4
  Rémy Coutable authored Mar 28, 2019
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  dbe27cb4
- [CE] Reduce the diff with EE in spec/helpers/group_helper_spec.rb · af8aa246
  Rémy Coutable authored Mar 28, 2019
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  af8aa246
- [CE] Reduce the diff with EE in spec/helpers/auth_helper_spec.rb · 1067c87b
  Rémy Coutable authored Mar 28, 2019
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  1067c87b
- [CE] Reduce the diff with EE in spec/helpers/appearances_helper_spec.rb · cf07f9fd
  Rémy Coutable authored Mar 28, 2019
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  cf07f9fd
- Merge branch 'renovate/gitlab-svgs-1.x' into 'master' · 13230d18
  Mike Greiling authored Mar 28, 2019
```
Update dependency @gitlab/svgs to ^1.55.0

See merge request gitlab-org/gitlab-ce!26664
```
  13230d18
- Merge branch 'master' into 'renovate/gitlab-svgs-1.x' · 826d4e4d
  Lukas 'Eipi' Eipert authored Mar 28, 2019
```
# Conflicts:
#   package.json
```
  826d4e4d
- Update ci workflow illustration · ddd6259d
  Marcia Ramos authored Mar 28, 2019
  
  ddd6259d
- Merge branch '24936-remove-type-from-review-app-name' into 'master' · a74c3e6c
  Mike Greiling authored Mar 28, 2019
```
Remove redundant group name from environment name on the "Environments" page

Closes #24936

See merge request gitlab-org/gitlab-ce!25600
```
  a74c3e6c
- Merge branch 'standardize-click-and-go-to' into 'master' · 3f69bd51
  Rémy Coutable authored Mar 28, 2019
```
Standardize usage of `click_` and `go_to` on GUI tests

See merge request gitlab-org/gitlab-ce!26328
```
  3f69bd51
- Standardize usage of `click_` and `go_to` on GUI tests · 2ace53fe
  Walmyr authored Mar 28, 2019
```
This MR addresses the following issue:
https://gitlab.com/gitlab-org/gitlab-ce/issues/57043
Based on the following comment:
https://gitlab.com/gitlab-org/gitlab-ce/issues/57043#note_136663994
```
  2ace53fe
- Merge branch 'id-get-blobs-performance' into 'master' · a85fd76f
  Douwe Maan authored Mar 28, 2019
```
Memoize old_blob and new_blob to improve performance

See merge request gitlab-org/gitlab-ce!26604
```
  a85fd76f
- Memoize old_blob and new_blob to improve performance · db68003e
  Igor authored Mar 28, 2019
  
  db68003e
- Merge branch 'docs-document-qa-specific-branch-naming' into 'master' · b8e9a379
  Rémy Coutable authored Mar 28, 2019
```
Document the branch naming conventions for QA-only changes

See merge request gitlab-org/gitlab-ce!26704
```
  b8e9a379
- Document the branch naming conventions for QA-only changes · 1e3c09d8
  Rémy Coutable authored Mar 28, 2019
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  1e3c09d8
- Merge branch 'remove-cng-job' into 'master' · 04496085
  Robert Speicher authored Mar 28, 2019
```
Remove cloud-native-job from CI

See merge request gitlab-org/gitlab-ce!25605
```
  04496085
- Merge branch 'knative-update' into 'master' · 4488b592
  Grzegorz Bizon authored Mar 28, 2019
```
Knative version bump 0.2.2 -> 0.3.0

See merge request gitlab-org/gitlab-ce!26459
```
  4488b592
- Knative version bump 0.2.2 -> 0.3.0 · ae49284b
  Chris Baumbauer authored Mar 28, 2019
  
  ae49284b
- Merge branch... · 335c925d
  Phil Hughes authored Mar 28, 2019
```
Merge branch '9957-move-ee-differences-for-app-assets-javascripts-monitoring-components-dashboard-vue-ce' into 'master'

Remove EE differences for monitoring dashboard

See merge request gitlab-org/gitlab-ce!26574
```
  335c925d
- Merge branch '59079-fix-jupyter-render-loop' into 'master' · a624f160
  Phil Hughes authored Mar 28, 2019
```
Fix jupyter rendering bug that ended in an infinite loop

Closes #59079

See merge request gitlab-org/gitlab-ce!26667
```
  a624f160
- Merge branch '10518-boards-css' into 'master' · 406d3ee6
  Phil Hughes authored Mar 28, 2019
```
Removes EE differences for boards.scss

Closes gitlab-ee#10518

See merge request gitlab-org/gitlab-ce!26647
```
  406d3ee6
- Merge branch 'docs/review-MR-25586' into 'master' · ed99dafc
  Achilleas Pipinellis authored Mar 28, 2019
```
Docs review for MR 25586

Closes #59262

See merge request gitlab-org/gitlab-ce!26632
```
  ed99dafc
- Docs review for MR 25586 · a66db7be
  Evan Read authored Mar 28, 2019
  
  a66db7be
- Merge branch 'zm-test-plan-refs' into 'master' · d119fd49
  Achilleas Pipinellis authored Mar 28, 2019
```
Update testing guide to reference test design

See merge request gitlab-org/gitlab-ce!26619
```
  d119fd49
- Merge branch '54670-external-diffs-when-outdated' into 'master' · 1ab4d12a
  Sean McGivern authored Mar 28, 2019
```
Allow external diffs to be used conditionally

Closes #54670

See merge request gitlab-org/gitlab-ce!25432
```
  1ab4d12a
- Merge branch '59273-update-fugit' into 'master' · fd3f70c3
  Grzegorz Bizon authored Mar 28, 2019
```
Update fugit which fixes a potential infinite loop

Closes #59273

See merge request gitlab-org/gitlab-ce!26579
```
  fd3f70c3
- Merge branch '59062-update-gitlab-markup-python-3' into 'master' · ef18642b
  Sean McGivern authored Mar 28, 2019
```
Update gitlab-markup to 1.7.0 and document Python3 requirements

Closes #59062

See merge request gitlab-org/gitlab-ce!26246
```
  ef18642b
- Merge branch 'fix-routes-n-plus-one-in-user-autocomplete' into 'master' · 8d07bc9c
  Grzegorz Bizon authored Mar 28, 2019
```
Remove N+1 queries from users autocomplete

See merge request gitlab-org/gitlab-ce!26491
```
  8d07bc9c
- Merge branch '59546-fix-error-handling-for-missing-domain' into 'master' · 0540cb6b
  Sean McGivern authored Mar 28, 2019
```
Fix Auto DevOps missing domain error handling

Closes #59546

See merge request gitlab-org/gitlab-ce!26627
```
  0540cb6b
- Merge branch 'qa-allow-gitlab-qa-pat-env-var' into 'master' · 7732db22
  Rémy Coutable authored Mar 28, 2019
```
Allow personal access token env var from gitlab-qa

See merge request gitlab-org/gitlab-ce!24048
```
  7732db22
- Allow token env var from gitlab-qa · 35c55576
  Mark Lapierre authored Mar 28, 2019
```
gitlab-qa accepts an env var named GITLAB_QA_ACCESS_TOKEN, but here we
only accepted PERSONAL_ACCESS_TOKEN.

This change replaces PERSONAL_ACCESS_TOKEN with GITLAB_QA_ACCESS_TOKEN
```
  35c55576
- Merge branch 'rubocop-handle-ee-migration-specs' into 'master' · d762302e
  Rémy Coutable authored Mar 28, 2019
```
Properly handle `ee` migration specs

See merge request gitlab-org/gitlab-ce!26685
```
  d762302e
- Merge branch 'ce-reduce-ee-diff-in-spec-policies' into 'master' · 7753648a
  Lin Jen-Shin authored Mar 28, 2019
```
[CE] Reduce diff with EE in `spec/policies`

See merge request gitlab-org/gitlab-ce!26593
```
  7753648a