Commits · 6da4fa8551972b6a72ae677691e871ee2d793377 · nexedi / gitlab-ce

29 Jan, 2019 36 commits
- We don't need a repository here, aligning with CE · 6da4fa85
  Lin Jen-Shin authored Jan 29, 2019
  
  6da4fa85
- Automatic merge of gitlab-org/gitlab-ce master · 3263a096
  GitLab Bot authored Jan 29, 2019
  
  3263a096
- Merge branch 'fix-approval-state-rule-order' into 'master' · 9020cfe7
  Douwe Maan authored Jan 29, 2019
```
Fix sporadic spec failure on return order of approval rules

See merge request gitlab-org/gitlab-ee!9327
```
  9020cfe7
- Merge branch 'tnir/prometheus-metrics-docs' into 'master' · 6010028b
  Marcia Ramos authored Jan 29, 2019
```
Fix typo: Prometheus Metrics

See merge request gitlab-org/gitlab-ce!24344
```
  6010028b
- Merge branch 'ee-tnir/prometheus-metrics-docs' into 'master' · 2a546343
  Marcia Ramos authored Jan 29, 2019
```
EE Port: Fix typo: Prometheus Metrics

See merge request gitlab-org/gitlab-ee!9335
```
  2a546343
- Automatic merge of gitlab-org/gitlab-ce master · fcbe1807
  GitLab Bot authored Jan 29, 2019
  
  fcbe1807
- Merge branch 'remove-duplicated-show-forms-on-cluster-views' into 'master' · 96777060
  Grzegorz Bizon authored Jan 29, 2019
```
Removes duplicated cluster show partials

See merge request gitlab-org/gitlab-ce!24654
```
  96777060
- Merge branch 'qa-ml-quarantine-diff-patch-spec' into 'master' · 244f4f5f
  Mark Lapierre authored Jan 29, 2019
```
Quarantine diff patch spec

See merge request gitlab-org/gitlab-ce!24769
```
  244f4f5f
- Quarantine failing test · 58ec656b
  Mark Lapierre authored Jan 29, 2019
```
See: https://gitlab.com/gitlab-org/quality/nightly/issues/42
Also failing in staging until the fix is picked into the next release:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24533
```
  58ec656b
- Automatic merge of gitlab-org/gitlab-ce master · e1a1e56a
  GitLab Bot authored Jan 29, 2019
  
  e1a1e56a
- Merge branch 'gt-externalize-app-views-projects-milestones' into 'master' · fda30abd
  Kushal Pandya authored Jan 29, 2019
```
Externalize strings from `/app/views/projects/milestones`

See merge request gitlab-org/gitlab-ce!24726
```
  fda30abd
- Externalize strings from `/app/views/projects/milestones` · 9cf89890
  George Tsiolis authored Jan 29, 2019
  
  9cf89890
- Fix typo: Prometheus Metrics · 43cefd5a
  Takuya Noguchi authored Jan 13, 2019
```
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
```
  43cefd5a
- Fix typo: Prometheus Metrics · 65419ec2
  Takuya Noguchi authored Jan 13, 2019
```
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
```
  65419ec2
- Automatic merge of gitlab-org/gitlab-ce master · 5158ea2c
  GitLab Bot authored Jan 29, 2019
  
  5158ea2c
- Merge branch 'gt-externalize-app-views-projects-milestones-ee' into 'master' · f0f87477
  Kushal Pandya authored Jan 29, 2019
```
Externalize strings from `/app/views/projects/milestones`

See merge request gitlab-org/gitlab-ee!9320
```
  f0f87477
- Externalize strings from `/app/views/projects/milestones` · 6304ab5f
  George Tsiolis authored Jan 29, 2019
  
  6304ab5f
- Merge branch 'renovate/gitlab-svgs-1.x' into 'master' · 021048bd
  Kushal Pandya authored Jan 29, 2019
```
Update dependency @gitlab/svgs to ^1.48.0

See merge request gitlab-org/gitlab-ce!24744
```
  021048bd
- Automatic merge of gitlab-org/gitlab-ce master · 758f2941
  GitLab Bot authored Jan 29, 2019
  
  758f2941
- Merge branch '50352-sort-save-ee' into 'master' · 2d17e8e6
  Sean McGivern authored Jan 29, 2019
```
Port of 50352-sort-save

See merge request gitlab-org/gitlab-ee!9219
```
  2d17e8e6
- Merge branch '50352-sort-save' into 'master' · 4a60baf9
  Sean McGivern authored Jan 29, 2019
```
Save sorting preference for Issues/MRs in BE

Closes #50352

See merge request gitlab-org/gitlab-ce!24198
```
  4a60baf9
- Automatic merge of gitlab-org/gitlab-ce master · 7beb4d7c
  GitLab Bot authored Jan 29, 2019
  
  7beb4d7c
- Merge branch 'gt-externalize-app-views-clusters' into 'master' · a2468878
  Filipa Lacerda authored Jan 29, 2019
```
Externalize strings from `/app/views/clusters`

See merge request gitlab-org/gitlab-ce!24666
```
  a2468878
- Merge branch 'docs-localized-dates-in-ruby' into 'master' · 257d5a80
  Marcia Ramos authored Jan 29, 2019
```
Document how to format localized dates in Ruby

Closes #41237

See merge request gitlab-org/gitlab-ce!24585
```
  257d5a80
- Merge branch '7751-add-refactored-epics-sidebar-parent-epic-support' into 'master' · 3aabc184
  Phil Hughes authored Jan 29, 2019
```
[Part 5] Add support for Parent Epic in Epic sidebar

See merge request gitlab-org/gitlab-ee!9318
```
  3aabc184
- Fix sporadic spec failure on return order of approval rules · f32d4009
  Mark Chao authored Jan 29, 2019
```
Sometimes the returned rule on single rule permission
can change due to not explicitly specify order by id.
```
  f32d4009
- Externalize strings from `/app/views/clusters` · 3484bd29
  George Tsiolis authored Jan 25, 2019
  
  3484bd29
- Update dependency @gitlab/svgs to ^1.48.0 · 16f00bd9
  Lukas 'Eipi' Eipert authored Jan 29, 2019
  
  16f00bd9
- Merge branch 'qa-fix-wait-on-relalted-issue' into 'master' · beba8dea
  Ramya Authappan authored Jan 29, 2019
```
Fix hit miss of "Show all activity" button

Closes gitlab-org/quality/nightly#66

See merge request gitlab-org/gitlab-ee!9314
```
  beba8dea
- Automatic merge of gitlab-org/gitlab-ce master · d38d3a37
  GitLab Bot authored Jan 29, 2019
  
  d38d3a37
- Merge branch 'gitlab-kitchen-analogy-docs' into 'master' · 8b25e00f
  Mike Lewis authored Jan 29, 2019
```
Add GitLab as kitchen analogy

See merge request gitlab-org/gitlab-ce!24742
```
  8b25e00f
- Merge branch 'da-fix-broken-master' into 'master' · d87b8c1f
  Stan Hu authored Jan 29, 2019
```
Add missing translated strings to `locale/gitlab.pot`

See merge request gitlab-org/gitlab-ee!9323
```
  d87b8c1f
- Update kitchen metaphor per Suri comment · 7cbaa687
  Mike Lewis authored Jan 29, 2019
  
  7cbaa687
- Add missing translated strings · daa59be2
  Douglas Barbosa Alexandre authored Jan 28, 2019
  
  daa59be2
- Automatic merge of gitlab-org/gitlab-ce master · 2c92cb21
  GitLab Bot authored Jan 29, 2019
  
  2c92cb21
- Merge branch 'docs-56814-ci-variable-url-clarify' into 'master' · 4db2476f
  Evan Read authored Jan 29, 2019
```
Clarify that project URL could be HTTP or HTTPS

Closes #56814

See merge request gitlab-org/gitlab-ce!24667
```
  4db2476f
28 Jan, 2019 4 commits
- Automatic merge of gitlab-org/gitlab-ce master · d60d46b0
  GitLab Bot authored Jan 28, 2019
  
  d60d46b0
- Merge branch 'qa-ml-fix-rebase-spec' into 'master' · 479b515e
  Ramya Authappan authored Jan 28, 2019
```
Reload if needed when checking merge status

Closes gitlab-org/quality/nightly#64

See merge request gitlab-org/gitlab-ce!24732
```
  479b515e
- Automatic merge of gitlab-org/gitlab-ce master · 4078261f
  GitLab Bot authored Jan 28, 2019
  
  4078261f
- Merge branch 'refactor/56366-extract-resolve-discussion-button' into 'master' · f6c8e9c6
  Fatih Acet authored Jan 28, 2019
```
refactor(NoteableDiscussion): Extracted ResolveDiscussionButton from

See merge request gitlab-org/gitlab-ce!24505
```
  f6c8e9c6