Commits · ec33bc71e923128ffcdabbaf58c96d9cb0794a25 · nexedi / gitlab-ce

25 Mar, 2019 31 commits
- Mark .eslintrc.yml as frontend change for Danger · ec33bc71
  Winnie Hellmann authored Mar 25, 2019
  
  ec33bc71
- 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
- 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 '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 '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 '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 '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 '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 '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
- 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
- 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
- Merge branch 'docs/fix-emoji-images' into 'master' · 9dd5cb9b
  Evan Read authored Mar 25, 2019
```
Fix Emoji URLs

Closes #59139

See merge request gitlab-org/gitlab-ce!26298
```
  9dd5cb9b
- Fix Emoji URLs · bb3ed72d
  David Coy authored Mar 25, 2019
  
  bb3ed72d
- Merge branch 'docs-anchors13-misc' into 'master' · bff6d9da
  Evan Read authored Mar 25, 2019
```
Docs: Fix missed or newly added broken anchors

See merge request gitlab-org/gitlab-ce!25997
```
  bff6d9da
- Docs: Fix missed or newly added broken anchors · b41b03d4
  Marcel Amirault authored Mar 25, 2019
  
  b41b03d4
- Merge branch 'docs-anchors7-issues' into 'master' · 6c36fe9d
  Evan Read authored Mar 25, 2019
```
Docs: Fixing anchors and links for all docs related to issues.

See merge request gitlab-org/gitlab-ce!25516
```
  6c36fe9d
- Docs: Fixing anchors and links for all docs related to issues. · b3587a8b
  Marcel Amirault authored Mar 25, 2019
  
  b3587a8b
24 Mar, 2019 3 commits
- Merge branch 'docs/add-instance-level-templates' into 'master' · 83153e65
  Evan Read authored Mar 24, 2019
```
Add instance level templates to the examples page.

See merge request gitlab-org/gitlab-ce!25927
```
  83153e65
- Add instance level templates to the examples page. · 3ba05d4f
  Brendan O'Leary 🐢 authored Mar 24, 2019
  
  3ba05d4f
- Merge branch 'docs/fix-link-to-personas' into 'master' · 19b61288
  Evan Read authored Mar 24, 2019
```
Fix link to personas UX guide

See merge request gitlab-org/gitlab-ce!26478
```
  19b61288
23 Mar, 2019 2 commits
- Move some tests from Karma to Jest · 514ee638
  Winnie Hellmann authored Mar 23, 2019
  
  514ee638
- Copy vue_mount_component_helper.js to Jest · 6d330015
  Winnie Hellmann authored Mar 23, 2019
  
  6d330015
22 Mar, 2019 4 commits
- Makes emoji picker full width on mobile · fa976454
  Jacopo authored Mar 22, 2019
  
  fa976454
- Merge branch 'move-details-of-e2e-tests-to-the-bottom' into 'master' · 09d25b04
  Mark Lapierre authored Mar 22, 2019
```
Move details of e2e tests to the bottom

See merge request gitlab-org/gitlab-ce!26494
```
  09d25b04
- Merge branch 'retain-default-branch-on-import' into 'master' · 3eba3a18
  Stan Hu authored Mar 22, 2019
```
Set proper default-branch on GitHub Import

Closes #59347

See merge request gitlab-org/gitlab-ce!26476
```
  3eba3a18
- Set proper default-branch on GitHub Import · 98194f17
  Kamil Trzciński authored Mar 22, 2019
  
  98194f17