Commits · fea9400ec8a2a31d582a425226494f5fb9f90495 · Boxiang Sun / gitlab-ce

29 Mar, 2019 11 commits
- Merge branch 'add-pluck-primary-key' into 'master' · fea9400e
  Robert Speicher authored Mar 29, 2019
```
Add a thin encapsulation around .pluck(:id)

See merge request gitlab-org/gitlab-ce!26669
```
  fea9400e
- Merge branch 'winh-jest-gon' into 'master' · 36ecc88d
  Filipa Lacerda authored Mar 29, 2019
```
Set gon.ee in Jest

Closes #59634

See merge request gitlab-org/gitlab-ce!26713
```
  36ecc88d
- Merge branch '10735-geo-gitlab-revision-can-return-not-consistent-results' into 'master' · 7ae35d0a
  Sean McGivern authored Mar 29, 2019
```
Use a fixed git abbrev parameter when we fetch a git revision

See merge request gitlab-org/gitlab-ce!26707
```
  7ae35d0a
- Merge branch 'leipert-port-scsslint' into 'master' · c395ef1d
  Filipa Lacerda authored Mar 29, 2019
```
Backport scss-lint config from EE

See merge request gitlab-org/gitlab-ce!26711
```
  c395ef1d
- Merge branch '10085-resovle-ee-diff' into 'master' · a241b5e3
  Filipa Lacerda authored Mar 29, 2019
```
Adds EE validators to CE file

See merge request gitlab-org/gitlab-ce!26736
```
  a241b5e3
- Adds EE validators to CE file · 9bb41e89
  Sarah Groff Hennigh-Palermo authored Mar 29, 2019
  
  9bb41e89
- Merge branch 'winh-jest-helpers' into 'master' · 9b812763
  Phil Hughes authored Mar 29, 2019
```
Copy missing helpers from Karma to Jest

See merge request gitlab-org/gitlab-ce!26729
```
  9b812763
- Merge branch 'tr-add-requested-resource-metric-ce' into 'master' · 183b9142
  Phil Hughes authored Mar 29, 2019
```
Add requested resources to cluster health - ce port

See merge request gitlab-org/gitlab-ce!26326
```
  183b9142
- Add requested resources to cluster health - ce port · f4b8ec7e
  Tristan Read authored Mar 29, 2019
  
  f4b8ec7e
- Merge branch 'patch-30' into 'master' · 3a477fec
  Evan Read authored Mar 29, 2019
```
README.md: fix URL to CI Lint

See merge request gitlab-org/gitlab-ce!26580
```
  3a477fec
- 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 29 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
- Copy missing helpers from Karma to Jest · 2e748668
  Winnie Hellmann authored Mar 28, 2019
```
Copy missing helpers from Karma to Jest
```
  2e748668
- 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
- Set gon.ee in Jest · 63f6fcd0
  Winnie Hellmann authored Mar 28, 2019
  
  63f6fcd0
- Ignore Jest config from ESLint · 5a2d7bf2
  Winnie Hellmann authored Mar 28, 2019
  
  5a2d7bf2
- Extract IS_EE config helper · baa671a3
  Winnie Hellmann authored Mar 28, 2019
  
  baa671a3
- 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
- Add a thin encapsulation around .pluck(:id) · f086dbf6
  Nick Thomas authored Mar 27, 2019
  
  f086dbf6
- Inherit from ApplicationRecord instead of ActiveRecord::Base · 013f7cd2
  Nick Thomas authored Mar 28, 2019
  
  013f7cd2
- 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
- Use a fixed git abbrev parameter when we fetch a git revision · cc2e849a
  Valery Sizov authored Mar 28, 2019
  
  cc2e849a
- Backport scss-lint config from EE · f0228177
  Lukas Eipert authored Mar 28, 2019
  
  f0228177
- 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