Commits · 1ee101fc9ac47c3a68a0a039ba7b9ab32879b0d0 · nexedi / gitlab-ce

25 Mar, 2019 40 commits
- Resolve CE/EE differences in MergeRequestPresenter spec · 1ee101fc
  Sean McGivern authored Mar 25, 2019
```
The rebase_path specs were duplicated in the same file.
```
  1ee101fc
- Automatic merge of gitlab-org/gitlab-ce master · eaba1acc
  GitLab Bot authored Mar 25, 2019
  
  eaba1acc
- Merge branch 'fix/missing-border' into 'master' · 4e045cd5
  Annabel Dunstone Gray authored Mar 25, 2019
```
fix(ui-bug): missing border of comments

Closes #58915 and #58538

See merge request gitlab-org/gitlab-ce!26242
```
  4e045cd5
- Fix border radius of discussion comments · 3b50596c
  Farhad Yasir authored Mar 25, 2019
  
  3b50596c
- Automatic merge of gitlab-org/gitlab-ce master · ed41e0a4
  GitLab Bot authored Mar 25, 2019
  
  ed41e0a4
- Merge branch 'revert-8fcdf34e' into 'master' · 6abd3880
  Phil Hughes authored Mar 25, 2019
```
Revert "Merge branch 'renovate/gitlab-ui-2.x' into 'master'" (CE backport)

See merge request gitlab-org/gitlab-ce!26535
```
  6abd3880
- Revert "Merge branch 'renovate/gitlab-ui-2.x' into 'master'" · 270d87d0
  Winnie Hellmann authored Mar 25, 2019
```
This reverts merge request !26380
```
  270d87d0
- Merge branch 'revert-8fcdf34e' into 'master' · aeaa69a9
  Phil Hughes authored Mar 25, 2019
```
Revert "Merge branch 'renovate/gitlab-ui-2.x' into 'master'"

See merge request gitlab-org/gitlab-ee!10400
```
  aeaa69a9
- Revert "Merge branch 'renovate/gitlab-ui-2.x' into 'master'" · d82d4377
  Winnie Hellmann authored Mar 25, 2019
```
This reverts commit 8fcdf34e
```
  d82d4377
- Automatic merge of gitlab-org/gitlab-ce master · 6238ad70
  GitLab Bot authored Mar 25, 2019
  
  6238ad70
- Merge branch '57984-store-branch-name' into 'master' · d64452eb
  Phil Hughes authored Mar 25, 2019
```
Resolves "Branch name is lost if I change commit mode in Web IDE"

Closes #57984

See merge request gitlab-org/gitlab-ce!26180
```
  d64452eb
- Fixed commit logic to pick a branch · a72241f4
  Natalia Tepluhina authored Mar 25, 2019
```
- fixed getter spec with correct getter name
```
  a72241f4
- Merge branch 'fix-master' into 'master' · 0260da25
  Rémy Coutable authored Mar 25, 2019
```
Fix locale/gitlab.pot

See merge request gitlab-org/gitlab-ee!10374
```
  0260da25
- Merge branch 'ce-10136-extract-ee-specific-files-lines-for-plan-spec-lib-gitlab' into 'master' · 9e98ccf1
  Rémy Coutable authored Mar 25, 2019
```
Freeze strings in ReferenceExtractor spec

See merge request gitlab-org/gitlab-ce!26466
```
  9e98ccf1
- Merge branch '10136-extract-ee-specific-files-lines-for-plan-spec-lib-gitlab' into 'master' · a76bb559
  Rémy Coutable authored Mar 25, 2019
```
Resolve "Extract EE specific files/lines for Plan spec/lib/gitlab"

Closes #10136

See merge request gitlab-org/gitlab-ee!10344
```
  a76bb559
- Merge branch 'winh-small-jestodus' into 'master' · 94bdec9f
  Kushal Pandya authored Mar 25, 2019
```
Move some tests from Karma to Jest

Closes gitlab-ee#10613 and gitlab-ee#10592

See merge request gitlab-org/gitlab-ce!26511
```
  94bdec9f
- Merge branch 'winh-small-jestodus-ee' into 'master' · 84f7a020
  Kushal Pandya authored Mar 25, 2019
```
Move some tests from Karma to Jest (EE-port)

Closes #10592

See merge request gitlab-org/gitlab-ee!10391
```
  84f7a020
- Automatic merge of gitlab-org/gitlab-ce master · ccfa572c
  GitLab Bot authored Mar 25, 2019
  
  ccfa572c
- Merge branch '57409-loading-button-transition' into 'master' · 87d36bc2
  Phil Hughes authored Mar 25, 2019
```
Prevent fade out transition on loading-button

Closes #57409

See merge request gitlab-org/gitlab-ce!26428
```
  87d36bc2
- Prevent fade out transition on loading-button · 4f031229
  Enrique Alcántara authored Mar 25, 2019
  
  4f031229
- Merge branch '57648-make-emoji-picker-full-width-on-mobile' into 'master' · 668c38f4
  Phil Hughes authored Mar 25, 2019
```
Resolve "Make emoji picker full-width on mobile"

Closes #57648

See merge request gitlab-org/gitlab-ce!25883
```
  668c38f4
- Merge branch 'update-gitlab-runner-helm-chart-to-0-3-0' into 'master' · 68e6cb5d
  James Lopez authored Mar 25, 2019
```
Update GitLab Runner Helm Chart to 0.3.0/11.9.0

See merge request gitlab-org/gitlab-ce!26467
```
  68e6cb5d
- Merge branch '10603-markdown-css' into 'master' · 47837db9
  Phil Hughes authored Mar 25, 2019
```
Removes EE differences for markdown_area.scss

Closes gitlab-ee#10603

See merge request gitlab-org/gitlab-ce!26489
```
  47837db9
- Merge branch '10602-lists-css' into 'master' · 66418658
  Phil Hughes authored Mar 25, 2019
```
Removes EE differences for lists.scss

Closes gitlab-ee#10602

See merge request gitlab-org/gitlab-ce!26487
```
  66418658
- Merge branch '10597-select-css' into 'master' · 08e1ed78
  Phil Hughes authored Mar 25, 2019
```
Removes EE differences for selects.scss

Closes gitlab-ee#10597

See merge request gitlab-org/gitlab-ce!26472
```
  08e1ed78
- Merge branch '48297-fix-code-selection' into 'master' · f773248d
  Phil Hughes authored Mar 25, 2019
```
Resolve "Code in other column of side-by-side diff is highlighted when selecting code on one side"

Closes #48297

See merge request gitlab-org/gitlab-ce!26423
```
  f773248d
- Resolve "Code in other column of side-by-side diff is highlighted when selecting code on one side" · 10659211
  Natalia Tepluhina authored Mar 25, 2019
  
  10659211
- Merge branch 'ee-10535-buttons-css' into 'master' · d3946cca
  Phil Hughes authored Mar 25, 2019
```
EE: Removes EE differences for buttons.scss

See merge request gitlab-org/gitlab-ee!10340
```
  d3946cca
- Merge branch '10539-variables-scss' into 'master' · 109de2a7
  Phil Hughes authored Mar 25, 2019
```
Removes EE differences for variables.scss

Closes gitlab-ee#10539

See merge request gitlab-org/gitlab-ce!26361
```
  109de2a7
- Merge branch 'ee-10539-variables-scss' into 'master' · f55ff9b9
  Phil Hughes authored Mar 25, 2019
```
EE: Removes EE differences for variables.scss

See merge request gitlab-org/gitlab-ee!10317
```
  f55ff9b9
- Automatic merge of gitlab-org/gitlab-ce master · 332de36d
  GitLab Bot authored Mar 25, 2019
  
  332de36d
- Merge branch 'renovate/gitlab-ui-2.x' into 'master' · 8fcdf34e
  Phil Hughes authored Mar 25, 2019
```
Update dependency @gitlab/ui to ^2.4.1

See merge request gitlab-org/gitlab-ce!26380
```
  8fcdf34e
- Merge branch '10538-avatar-css' into 'master' · e393fbc2
  Phil Hughes authored Mar 25, 2019
```
removes ee differences for avatar.scss

Closes gitlab-ee#10538

See merge request gitlab-org/gitlab-ce!26360
```
  e393fbc2
- Merge branch '10535-buttons-css' into 'master' · b54b22cd
  Phil Hughes authored Mar 25, 2019
```
Removes EE differences for buttons.scss

Closes gitlab-ee#10535

See merge request gitlab-org/gitlab-ce!26358
```
  b54b22cd
- Automatic merge of gitlab-org/gitlab-ce master · 2917cc9b
  GitLab Bot authored Mar 25, 2019
  
  2917cc9b
- Merge branch 'ce-56153-error-tracking-counts' into 'master' · 5c6477fb
  Dmitriy Zaporozhets authored Mar 25, 2019
```
Add error tracking usage counts

See merge request gitlab-org/gitlab-ce!25472
```
  5c6477fb
- Add error tracking usage counts · 0cd7ebf7
  Logan King authored Mar 25, 2019
  
  0cd7ebf7
- Automatic merge of gitlab-org/gitlab-ce master · 9c98c808
  GitLab Bot authored Mar 25, 2019
  
  9c98c808
- Merge branch 'docs-junit-report-paths-matching' into 'master' · 66115fee
  Evan Read authored Mar 25, 2019
```
Correct JUnit report path pattern matching description

See merge request gitlab-org/gitlab-ce!26215
```
  66115fee
- Automatic merge of gitlab-org/gitlab-ce master · 0b0fb963
  GitLab Bot authored Mar 25, 2019
  
  0b0fb963