summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove unnecessary classfiles-css-refactorSam Bigelow2019-03-281-1/+0
|
* WIP: Files.css refactorSam Bigelow2019-03-281-76/+50
|
* Remove rounded border on fileheaders when stickySam Bigelow2019-03-283-9/+26
|
* Resize filename headers to match compareVersionsSam Bigelow2019-03-281-0/+1
|
* Make file actions buttons a group and reorderSam Bigelow2019-03-281-59/+60
|
* Rearrange buttons and change to icons for full fileSam Bigelow2019-03-282-13/+16
|
* Fix double border on MR DiffsSam Bigelow2019-03-281-1/+1
| | | | | This fixes a double border between the compare versions header and the filename header when filename headers are sticky
* Always extend compareVersions full content widthSam Bigelow2019-03-285-12/+68
| | | | | | - This used to change based on whether or not the file tree was open - There is logic to contain buttons and diffs when fileTree is closed and diffs are inline
* Merge branch 'ce-1974-update-user-name-upon-ldap-sync' into 'master'Douwe Maan2019-03-253-14/+16
|\ | | | | | | | | Backport 'Update user name upon LDAP sync' from EE See merge request gitlab-org/gitlab-ce!26432
| * Backport 'Update user name upon LDAP sync' from EERémy Coutable2019-03-253-14/+16
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'ce-mw-update-gl-search-box' into 'master'Phil Hughes2019-03-252-5/+5
|\ \ | | | | | | | | | | | | | | | | | | (CE port) Replace GlSearchBox with GlSearchBoxByType Closes gitlab-ee#10637 See merge request gitlab-org/gitlab-ce!26548
| * | (CE port) Replace GlSearchBox with GlSearchBoxByTypeMartin Wortschack2019-03-252-5/+5
|/ /
* | Merge branch '56954-improve-knative-after-installing-tiller' into 'master'Sean McGivern2019-03-255-1/+49
|\ \ | | | | | | | | | | | | | | | | | | Improvements for Knative installation Closes #56954 See merge request gitlab-org/gitlab-ce!26339
| * | Improvements for Knative installationMayra Cabrera2019-03-255-1/+49
|/ / | | | | | | | | | | | | Displays Knative domain field automatically after Helm is successfully installed. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56954
* | Merge branch ↵Rémy Coutable2019-03-251-2/+44
|\ \ | | | | | | | | | | | | | | | | | | 'ce-6543-extract-ee-specific-files-lines-for-some-discussion-tests' into 'master' Resolve CE/EE differences in MergeRequestPresenter spec See merge request gitlab-org/gitlab-ce!26546
| * | Resolve CE/EE differences in MergeRequestPresenter specSean McGivern2019-03-251-2/+44
| | |
* | | Merge branch 'winh-eslint-config-danger' into 'master'Mike Greiling2019-03-251-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Mark .eslintrc.yml as frontend change for Danger See merge request gitlab-org/gitlab-ce!26549
| * | | Mark .eslintrc.yml as frontend change for DangerWinnie Hellmann2019-03-251-1/+1
| |/ /
* | | Merge branch '10641-settings-css' into 'master'57620-add-time-preferences-to-user-bePhil Hughes2019-03-251-0/+52
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for settings.scss Closes gitlab-ee#10641 See merge request gitlab-org/gitlab-ce!26543
| * | | Removes EE differences for settings.scssFilipa Lacerda2019-03-251-0/+52
| |/ /
* | | Merge branch '10642-groups-css' into 'master'Phil Hughes2019-03-251-0/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for groups.scss Closes gitlab-ee#10642 See merge request gitlab-org/gitlab-ce!26544
| * | | Removes EE differences for groups.scssFilipa Lacerda2019-03-251-0/+49
| |/ /
* | | Merge branch 'docs-improve-end-to-ends-tests-to-mention-review-qa-all-job' ↵Lin Jen-Shin2019-03-254-10/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Mention review-qa-all in the end-to-end tests documentation See merge request gitlab-org/gitlab-ce!26541
| * | | Mention review-qa-all in the end-to-end tests documentationRémy Coutable2019-03-254-10/+43
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '10638-secondary-css' into 'master'Phil Hughes2019-03-251-0/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for secondary_navigation_elements Closes gitlab-ee#10638 See merge request gitlab-org/gitlab-ce!26537
| * | | | Removes EE differences for secondary_navigation_elementsFilipa Lacerda2019-03-251-0/+27
| | |_|/ | |/| |
* | | | Merge branch '10604-pannels-css' into 'master'Phil Hughes2019-03-251-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for panels.scss Closes gitlab-ee#10604 See merge request gitlab-org/gitlab-ce!26492
| * | | | Removes EE differences for panels.scssFilipa Lacerda2019-03-221-1/+0
| | | | |
* | | | | Merge branch 'sh-fix-github-import-creator' into 'master'Douglas Barbosa Alexandre2019-03-253-4/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | GitHub importer: Use the project creator to create branches from forks Closes #59396 See merge request gitlab-org/gitlab-ce!26510
| * | | | GitHub importer: Use the project creator to create branches from forksStan Hu2019-03-233-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The project owner may actually be a group, in which case the branch creation would fail due to a lack of username. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59396
* | | | | Merge branch 'fix/missing-border' into 'master'Annabel Dunstone Gray2019-03-252-0/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | fix(ui-bug): missing border of comments Closes #58915 and #58538 See merge request gitlab-org/gitlab-ce!26242
| * | | | Fix border radius of discussion commentsFarhad Yasir2019-03-252-0/+6
|/ / / /
* | | | Merge branch 'revert-8fcdf34e' into 'master'Phil Hughes2019-03-252-5/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Revert "Merge branch 'renovate/gitlab-ui-2.x' into 'master'" (CE backport) See merge request gitlab-org/gitlab-ce!26535
| * | | Revert "Merge branch 'renovate/gitlab-ui-2.x' into 'master'"Winnie Hellmann2019-03-252-5/+5
|/ / / | | | | | | | | | This reverts merge request !26380
* | | Merge branch '57984-store-branch-name' into 'master'Phil Hughes2019-03-256-10/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolves "Branch name is lost if I change commit mode in Web IDE" Closes #57984 See merge request gitlab-org/gitlab-ce!26180
| * | | Fixed commit logic to pick a branchNatalia Tepluhina2019-03-256-10/+23
|/ / / | | | | | | | | | - fixed getter spec with correct getter name
* | | Merge branch ↵Rémy Coutable2019-03-251-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | Freeze strings in ReferenceExtractor specSean McGivern2019-03-221-0/+2
| | | |
* | | | Merge branch 'winh-small-jestodus' into 'master'Kushal Pandya2019-03-2575-0/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move some tests from Karma to Jest Closes gitlab-ee#10613 and gitlab-ee#10592 See merge request gitlab-org/gitlab-ce!26511
| * | | | Move some tests from Karma to JestWinnie Hellmann2019-03-2374-0/+0
| | | | |
| * | | | Copy vue_mount_component_helper.js to JestWinnie Hellmann2019-03-231-0/+38
| | |/ / | |/| |
* | | | Merge branch '57409-loading-button-transition' into 'master'Phil Hughes2019-03-253-3/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent fade out transition on loading-button Closes #57409 See merge request gitlab-org/gitlab-ce!26428
| * | | | Prevent fade out transition on loading-buttonEnrique Alcántara2019-03-253-3/+12
|/ / / /
* | | | Merge branch '57648-make-emoji-picker-full-width-on-mobile' into 'master'Phil Hughes2019-03-253-2/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make emoji picker full-width on mobile" Closes #57648 See merge request gitlab-org/gitlab-ce!25883
| * | | | Makes emoji picker full width on mobileJacopo2019-03-223-2/+11
| | | | |
* | | | | Merge branch 'update-gitlab-runner-helm-chart-to-0-3-0' into 'master'James Lopez2019-03-253-3/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update GitLab Runner Helm Chart to 0.3.0/11.9.0 See merge request gitlab-org/gitlab-ce!26467
| * | | | | Update GitLab Runner Helm Chart to 0.3.0Tomasz Maczukin2019-03-223-3/+8
| | | | | |
* | | | | | Merge branch '10603-markdown-css' into 'master'Phil Hughes2019-03-251-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for markdown_area.scss Closes gitlab-ee#10603 See merge request gitlab-org/gitlab-ce!26489
| * | | | | | Removes EE differences for markdown_area.scssFilipa Lacerda2019-03-221-0/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '10602-lists-css' into 'master'Phil Hughes2019-03-251-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for lists.scss Closes gitlab-ee#10602 See merge request gitlab-org/gitlab-ce!26487
View Lorry Controller Status