Nick Thomas
83fc1464dd
Rename GitPushService -> Git::BranchPushService
2019-03-25 13:02:31 +00:00
Nick Thomas
558e946263
Rename GitTagPushService -> Git::TagPushService
2019-03-25 12:56:46 +00:00
Nick Thomas
ed99296edf
Move some logic to a helper method in GitPushService
2019-03-25 12:54:48 +00:00
Annabel Dunstone Gray
4e045cd5aa
Merge branch 'fix/missing-border' into 'master'
...
fix(ui-bug): missing border of comments
Closes #58915 and #58538
See merge request gitlab-org/gitlab-ce!26242
2019-03-25 11:45:06 +00:00
Farhad Yasir
3b50596c5d
Fix border radius of discussion comments
2019-03-25 11:45:05 +00:00
Phil Hughes
6abd3880fb
Merge branch 'revert-8fcdf34e' into 'master'
...
Revert "Merge branch 'renovate/gitlab-ui-2.x' into 'master'" (CE backport)
See merge request gitlab-org/gitlab-ce!26535
2019-03-25 11:13:23 +00:00
Winnie Hellmann
270d87d032
Revert "Merge branch 'renovate/gitlab-ui-2.x' into 'master'"
...
This reverts merge request !26380
2019-03-25 11:13:22 +00:00
Phil Hughes
d64452ebfc
Merge branch '57984-store-branch-name' into 'master'
...
Resolves "Branch name is lost if I change commit mode in Web IDE"
Closes #57984
See merge request gitlab-org/gitlab-ce!26180
2019-03-25 09:16:42 +00:00
Natalia Tepluhina
a72241f4a9
Fixed commit logic to pick a branch
...
- fixed getter spec with correct getter name
2019-03-25 09:16:41 +00:00
Rémy Coutable
9e98ccf174
Merge branch 'ce-10136-extract-ee-specific-files-lines-for-plan-spec-lib-gitlab' into 'master'
...
Freeze strings in ReferenceExtractor spec
See merge request gitlab-org/gitlab-ce!26466
2019-03-25 09:12:09 +00:00
Kushal Pandya
94bdec9f2b
Merge branch 'winh-small-jestodus' into 'master'
...
Move some tests from Karma to Jest
Closes gitlab-ee#10613 and gitlab-ee#10592
See merge request gitlab-org/gitlab-ce!26511
2019-03-25 09:11:14 +00:00
Phil Hughes
87d36bc20d
Merge branch '57409-loading-button-transition' into 'master'
...
Prevent fade out transition on loading-button
Closes #57409
See merge request gitlab-org/gitlab-ce!26428
2019-03-25 09:00:37 +00:00
Enrique Alcántara
4f03122959
Prevent fade out transition on loading-button
2019-03-25 09:00:36 +00:00
Phil Hughes
668c38f4f8
Merge branch '57648-make-emoji-picker-full-width-on-mobile' into 'master'
...
Resolve "Make emoji picker full-width on mobile"
Closes #57648
See merge request gitlab-org/gitlab-ce!25883
2019-03-25 08:54:57 +00:00
James Lopez
68e6cb5dd6
Merge branch 'update-gitlab-runner-helm-chart-to-0-3-0' into 'master'
...
Update GitLab Runner Helm Chart to 0.3.0/11.9.0
See merge request gitlab-org/gitlab-ce!26467
2019-03-25 08:53:45 +00:00
Phil Hughes
47837db9a2
Merge branch '10603-markdown-css' into 'master'
...
Removes EE differences for markdown_area.scss
Closes gitlab-ee#10603
See merge request gitlab-org/gitlab-ce!26489
2019-03-25 08:52:51 +00:00
Phil Hughes
66418658d0
Merge branch '10602-lists-css' into 'master'
...
Removes EE differences for lists.scss
Closes gitlab-ee#10602
See merge request gitlab-org/gitlab-ce!26487
2019-03-25 08:52:31 +00:00
Phil Hughes
08e1ed78f7
Merge branch '10597-select-css' into 'master'
...
Removes EE differences for selects.scss
Closes gitlab-ee#10597
See merge request gitlab-org/gitlab-ce!26472
2019-03-25 08:52:12 +00:00
Phil Hughes
f773248dd2
Merge branch '48297-fix-code-selection' into 'master'
...
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
2019-03-25 08:51:29 +00:00
Natalia Tepluhina
106592115d
Resolve "Code in other column of side-by-side diff is highlighted when selecting code on one side"
2019-03-25 08:51:29 +00:00
Phil Hughes
109de2a738
Merge branch '10539-variables-scss' into 'master'
...
Removes EE differences for variables.scss
Closes gitlab-ee#10539
See merge request gitlab-org/gitlab-ce!26361
2019-03-25 08:44:42 +00:00
Phil Hughes
8fcdf34e27
Merge branch 'renovate/gitlab-ui-2.x' into 'master'
...
Update dependency @gitlab/ui to ^2.4.1
See merge request gitlab-org/gitlab-ce!26380
2019-03-25 08:37:02 +00:00
Phil Hughes
e393fbc2e8
Merge branch '10538-avatar-css' into 'master'
...
removes ee differences for avatar.scss
Closes gitlab-ee#10538
See merge request gitlab-org/gitlab-ce!26360
2019-03-25 08:36:12 +00:00
Phil Hughes
b54b22cdf2
Merge branch '10535-buttons-css' into 'master'
...
Removes EE differences for buttons.scss
Closes gitlab-ee#10535
See merge request gitlab-org/gitlab-ce!26358
2019-03-25 08:35:41 +00:00
Dmitriy Zaporozhets
5c6477fb4c
Merge branch 'ce-56153-error-tracking-counts' into 'master'
...
Add error tracking usage counts
See merge request gitlab-org/gitlab-ce!25472
2019-03-25 07:42:09 +00:00
Logan King
0cd7ebf717
Add error tracking usage counts
2019-03-25 07:42:08 +00:00
Evan Read
66115fee28
Merge branch 'docs-junit-report-paths-matching' into 'master'
...
Correct JUnit report path pattern matching description
See merge request gitlab-org/gitlab-ce!26215
2019-03-25 06:34:22 +00:00
Evan Read
9dd5cb9bcd
Merge branch 'docs/fix-emoji-images' into 'master'
...
Fix Emoji URLs
Closes #59139
See merge request gitlab-org/gitlab-ce!26298
2019-03-25 05:05:30 +00:00
David Coy
bb3ed72d11
Fix Emoji URLs
2019-03-25 05:05:29 +00:00
Evan Read
bff6d9da04
Merge branch 'docs-anchors13-misc' into 'master'
...
Docs: Fix missed or newly added broken anchors
See merge request gitlab-org/gitlab-ce!25997
2019-03-25 04:56:58 +00:00
Marcel Amirault
b41b03d47c
Docs: Fix missed or newly added broken anchors
2019-03-25 04:56:57 +00:00
Evan Read
6c36fe9d29
Merge branch 'docs-anchors7-issues' into 'master'
...
Docs: Fixing anchors and links for all docs related to issues.
See merge request gitlab-org/gitlab-ce!25516
2019-03-25 04:29:52 +00:00
Marcel Amirault
b3587a8beb
Docs: Fixing anchors and links for all docs related to issues.
2019-03-25 04:29:51 +00:00
Evan Read
83153e65a5
Merge branch 'docs/add-instance-level-templates' into 'master'
...
Add instance level templates to the examples page.
See merge request gitlab-org/gitlab-ce!25927
2019-03-24 22:59:53 +00:00
Brendan O'Leary 🐢
3ba05d4ff4
Add instance level templates to the examples page.
2019-03-24 22:59:53 +00:00
Evan Read
19b61288ce
Merge branch 'docs/fix-link-to-personas' into 'master'
...
Fix link to personas UX guide
See merge request gitlab-org/gitlab-ce!26478
2019-03-24 22:57:34 +00:00
Winnie Hellmann
514ee63826
Move some tests from Karma to Jest
2019-03-23 17:53:46 +01:00
Winnie Hellmann
6d330015df
Copy vue_mount_component_helper.js to Jest
2019-03-23 17:53:42 +01:00
Jacopo
fa976454c1
Makes emoji picker full width on mobile
2019-03-22 21:50:03 +01:00
Mark Lapierre
09d25b04c3
Merge branch 'move-details-of-e2e-tests-to-the-bottom' into 'master'
...
Move details of e2e tests to the bottom
See merge request gitlab-org/gitlab-ce!26494
2019-03-22 19:46:29 +00:00
Stan Hu
3eba3a187c
Merge branch 'retain-default-branch-on-import' into 'master'
...
Set proper default-branch on GitHub Import
Closes #59347
See merge request gitlab-org/gitlab-ce!26476
2019-03-22 18:40:50 +00:00
Kamil Trzciński
98194f1766
Set proper default-branch on GitHub Import
2019-03-22 18:40:50 +00:00
Stan Hu
7ffc798291
Merge branch 'refresh-commit-count-after-head-change' into 'master'
...
Refresh commit count after repository head changes
Closes #59346
See merge request gitlab-org/gitlab-ce!26473
2019-03-22 18:38:08 +00:00
Annabel Dunstone Gray
85a1acbe50
Merge branch '46787-create-project-label-window-is-cut-off-at-the-bottom' into 'master'
...
Resolve ""Create project label" window is cut off at the bottom"
Closes #46787
See merge request gitlab-org/gitlab-ce!26049
2019-03-22 17:07:58 +00:00
Constance Okoghenun
b672d157b8
Reset maximum height for create label dropdown
2019-03-22 17:07:57 +00:00
Walmyr Lima
93ed9de179
Move details of e2e tests to the bottom
...
The code should be written like a newspaper, wherein the top we
have more high level information, and as we go down we have more
details.
So I'm moving the implementation details to the bottom to make the
test easier to read.
2019-03-22 17:34:40 +01:00
Lin Jen-Shin
5e9b683da7
Merge branch 'ce-6517-extract-ee-specific-files-lines-for-spec-services-emails' into 'master'
...
Freeze strings in email service specs
See merge request gitlab-org/gitlab-ce!26485
2019-03-22 16:05:17 +00:00
Filipa Lacerda
31e849c248
Removes EE differences for markdown_area.scss
2019-03-22 15:53:16 +00:00
Filipa Lacerda
e03bb5a77b
Removes EE differences for lists.scss
2019-03-22 15:23:23 +00:00
Sean McGivern
a01c738e1b
Freeze strings in email service specs
2019-03-22 14:56:06 +00:00