Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-11-09Merge branch 'remove-heading-space-from-diff-content' into 'master' Alfredo Sumaran
Remove an extra leading space from diff paste data ## What does this MR do? Remove an extra leading space from diff paste data. ## Are there points in the code the reviewer needs to double check? I have checked the following three patterns. * inline diff * parallel diff * blob preview ## Why was this MR needed? Diff paste data contain an extra leading space. So it need to remove an extra leading space manually from pasted diff data. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #14176 Closes #23899 See merge request !7133
2016-11-09Merge branch '24146-add-focus-state' into 'master' Annabel Dunstone Gray
24146 Add focus state to buttons and dropdowns ## What does this MR do? Adds focus state to buttons and dropdowns ## Are there points in the code the reviewer needs to double check? All focus states of buttons and dropdowns :) ## Why was this MR needed? Improve accessibility ## Screenshots (if relevant) Before: ![Screen_Shot_2016-11-07_at_4.30.31_PM](/uploads/8db2ac5e225c78495797180faf7bdb28/Screen_Shot_2016-11-07_at_4.30.31_PM.png) After: ![Screen_Shot_2016-11-07_at_4.30.16_PM](/uploads/4a81810cafe3063eef02b7bc87f8ce69/Screen_Shot_2016-11-07_at_4.30.16_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24146 See merge request !7347
2016-11-09Merge branch 'improve-build-scroll-controls-responsive-behaviour' into 'master' Fatih Acet
Improved build page scroll UX ## What does this MR do? This MR smoothes the UX of the builds page by more effectively affixing the scroll step buttons. It also ensures the scroll step buttons are always in view, even if the sidemenu is open. It also moves the autoscroll button into the same container as the scroll buttons. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The build scroll buttons are always in unpredictable places and are often hidden behind sidemenus. ## Screenshots (if relevant) ![2016-09-08_17.43.58](/uploads/49cb9ad5ef2764453afaa405af7111b2/2016-09-08_17.43.58.gif) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Contributes #21832 See merge request !6270
2016-11-0824146 Add focus state to buttons and dropdownstauriedavis
2016-11-07implements reset incoming email token on issues modal and account page,tiagonbotelho
reactivates all tests and writes more tests for it
2016-11-04Removed inline JS and added new affix declarationLuke Bennett
Tidied up UX Corrected naming convention issues with removing inline JS @deckar01 saves the day! Simplified `toggleSidebar` and `hideSidebar` Review changes Merge conflicts and update autoscroll button
2016-11-04Update commit page stylesAnnabel Dunstone Gray
2016-11-04Update commit.scss to have correct lintingDimitrie Hoekstra
2016-11-04added various changes to commit title areaDimitrie Hoekstra
2016-11-04Merge branch '24022-update-styling-commit-sha-in-branches-list' into 'master' Fatih Acet
Updated styling commit SHA on branches page ## What does this MR do? Updated styling of commit SHA on the branches page to include the commit icon and be blue ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? to make the branches page in line with upcoming update to the commit list, which also styles the commit sha, but slightly different. ## Screenshots (if relevant) before: ![image](/uploads/ce6eae30d0a07be2d76881d3c5e04e7d/image.png) after: ![image](/uploads/a10df4fe6efbb168fc9b51ae87f53da7/image.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24022 See merge request !7219
2016-11-04Update commits.scssDimitrie Hoekstra
2016-11-04updated styling commit SHA on branches page + added to changelogDimitrie Hoekstra
2016-11-04change build list height to show 6,5 builds + improve padding of list, with ↵Dimitrie Hoekstra
first/last child selectors
2016-11-04Remove an extra leading space from diff contentHiroyuki Sato
2016-11-04Merge branch '22914-mini-graph-icons' into 'master' Fatih Acet
Add new icon for skipped builds; show created state in mini graph ![Screen_Shot_2016-11-03_at_1.31.02_PM](/uploads/69be86d59f5939329cd869804e86cb87/Screen_Shot_2016-11-03_at_1.31.02_PM.png) ![Screen_Shot_2016-11-03_at_1.30.46_PM](/uploads/0d568ad94e3f072beb0728b402aa695a/Screen_Shot_2016-11-03_at_1.30.46_PM.png) Closes #22914 See merge request !7276
2016-11-04Merge branch 'file-toggle' into 'master' Fatih Acet
Unify dropdown button styles Unifies dropdown styles across app (use one shade of gray for border, always use caret instead of chevron) Before: ![Screen_Shot_2016-11-02_at_1.39.20_PM](/uploads/f0a2808c97aaa404626631683da32380/Screen_Shot_2016-11-02_at_1.39.20_PM.png) After: ![Screen_Shot_2016-11-02_at_1.39.45_PM](/uploads/cca0d40138d48f11cfc7183b202abad9/Screen_Shot_2016-11-02_at_1.39.45_PM.png) Should affect _all_ dropdowns ![Screen_Shot_2016-11-02_at_1.35.12_PM](/uploads/73874a46d79144a7a854eab57030c2bc/Screen_Shot_2016-11-02_at_1.35.12_PM.png) See merge request !7250
2016-11-03Merge branch 'build-status-focus-state' into 'master' Alfredo Sumaran
Remove underline focus state on statuses Before: ![Screen_Shot_2016-11-02_at_9.21.03_AM](/uploads/60d49c0cde418b45ee245d1a60d6ece7/Screen_Shot_2016-11-02_at_9.21.03_AM.png) After: ![Screen_Shot_2016-11-02_at_9.20.43_AM](/uploads/820c91d961b01d775465671ebceeba98/Screen_Shot_2016-11-02_at_9.20.43_AM.png) See merge request !7244
2016-11-03Remove g from svg colorsAnnabel Dunstone Gray
2016-11-03Add new icon for skipped builds; show created state in mini graphAnnabel Dunstone Gray
2016-11-03Merge branch 'group-name-validation' into 'master' Alfredo Sumaran
Adds JavaScript validation for group path editing ## What does this MR do? - Prevents group_edit form submission when special characters are included in the new group name - Enhances gl_field_errors to support this use case and be more re-usable. ## Are there points in the code the reviewer needs to double check? **The implementation of validation is here: https://gitlab.com/gitlab-org/gitlab-ce/commit/73d997046cac376ccdbcaac6f183002bc19b9a1f** The rest of the diff for this MR is augmenting gl_field_errors ## Why was this MR needed? - Currently we allow submission and a 500 error is returned. ## Screenshots (if relevant) ![2016-10-21_14.11.21](/uploads/2bef5764d3f2429dd0f900661153eef7/2016-10-21_14.11.21.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23564, https://gitlab.com/gitlab-org/gitlab-ce/issues/19756, https://gitlab.com/gitlab-org/gitlab-ce/issues/19736, https://gitlab.com/gitlab-org/gitlab-ce/issues/23922 See merge request !7041
2016-11-03Remove underline focus state on statusesAnnabel Dunstone Gray
2016-11-03Unify dropdown button stylesAnnabel Dunstone Gray
2016-11-02Merge branch 'sortable-version-update' into 'master' Fatih Acet
Updated Sortable JS plugin ## What does this MR do? Updates Sortable JS plugin for issue boards. The older version stopped the issue cards being draggable. ## What are the relevant issue numbers? Closes #23048 See merge request !6734
2016-11-02Merge branch 'boards-filter-zindex' into 'master' Annabel Dunstone Gray
Removed z-index for filters on issue boards ## What does this MR do? I dont know how this is has only just become a problem, but when the sidebar is open the filters on issue boards overlap it. ## Screenshots (if relevant) ### Before ![Screen_Shot_2016-11-02_at_09.50.59](/uploads/430ec15249b866999e83fe402cd9bd35/Screen_Shot_2016-11-02_at_09.50.59.png) ### After ![Screen_Shot_2016-11-02_at_09.49.40](/uploads/3a417570a874197ce4b66cbfadbf8181/Screen_Shot_2016-11-02_at_09.49.40.png) See merge request !7235
2016-11-02Removed z-index for filters on issue boardsPhil Hughes
2016-11-02Merge branch '23273-retry-build-btn' into 'master' Alfredo Sumaran
Resolve "Improve build "Retry" button on Build Page" * On desktop, adds retry button on build page header * On mobile, adds retry button in sidebar ![Screen_Shot_2016-10-28_at_1.35.07_PM](/uploads/2f9f87a9fc3e85c9aafc8c3d7a231639/Screen_Shot_2016-10-28_at_1.35.07_PM.png) ![Screen_Shot_2016-10-26_at_1.01.44_PM](/uploads/d02ce3a422a505b14ab357f695de8bba/Screen_Shot_2016-10-26_at_1.01.44_PM.png) Closes #23273 See merge request !7126
2016-11-01Merge branch '23545-distorted-images' into 'master' Annabel Dunstone Gray
23545 Fix distorted project and group avatars ## What does this MR do? Wraps project and group avatars in image container to prevent distortion ## Are there points in the code the reviewer needs to double check? - Group/project lists - Group/project pages - Group/project admin pages - Group/project edit pages ## Screenshots (if relevant) ### Before ![Screen_Shot_2016-10-31_at_12.35.42_PM](/uploads/abaeef7ded89abbba7e08be686c9a609/Screen_Shot_2016-10-31_at_12.35.42_PM.png) ### After ![Screen_Shot_2016-10-31_at_12.35.28_PM](/uploads/cafe1b096cf66afde7f346e5610bf3f3/Screen_Shot_2016-10-31_at_12.35.28_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23545 See merge request !7206
2016-11-0123545 Fix distorted project and group avatarstauriedavis
2016-11-01Merge branch 'todos-empty-state' into 'master' Fatih Acet
New todos blank state ## What does this MR do? Updates the blank state on todos. ### Blank state when user has previously had todos ![Screen_Shot_2016-10-12_at_12.40.35](/uploads/17d9a5a409d12bce73147e3879d9d62d/Screen_Shot_2016-10-12_at_12.40.35.png) ### Fully empty blank state ![Screen_Shot_2016-10-12_at_12.40.40](/uploads/5c0824096ced9f03b3ea5f892b70b08b/Screen_Shot_2016-10-12_at_12.40.40.png) ## What are the relevant issue numbers? Closes #20833 See merge request !6823
2016-11-01Upgrade gl_field_errors to support more use cases.Bryce Johnson
2016-11-01Merge branch '23918-reaction-button-style' into 'master' Annabel Dunstone Gray
Correct padding and alignment for reaction buttons ## What does this MR do? Fixes padding and alignment for reaction buttons on issues. ## Screenshots (if relevant) ### Before ![img](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ae788883aca84799fca9cd23f8e16f28/image.png) ![img](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2f5aa45dbb4899f054f839bd9046bb6/image.png) ### After ![Screen_Shot_2016-10-28_at_3.56.03_PM](/uploads/0b1affed448f6ec24fa56e7800daf753/Screen_Shot_2016-10-28_at_3.56.03_PM.png) ![Screen_Shot_2016-10-28_at_3.56.09_PM](/uploads/311bb59dc6eea8cd124232ebe647b5ef/Screen_Shot_2016-10-28_at_3.56.09_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23918 See merge request !7182
2016-11-01Flexbox webkit prefixesPhil Hughes
2016-11-01New todos blank statePhil Hughes
Closes #20833
2016-11-01Updated Sortable JS pluginPhil Hughes
Fixes an issue in Safari that stops issues from being draggable Closes #23048
2016-11-01Merge branch '20892-commit-info' into 'master' Fatih Acet
Resolve "Clean up commit meta info view" Updates commit page design Before: ![Screen_Shot_2016-10-19_at_10.20.10_AM](/uploads/8737a9db01bffc019d8b2c71a943024b/Screen_Shot_2016-10-19_at_10.20.10_AM.png) After: ![Screen_Shot_2016-10-19_at_10.20.01_AM](/uploads/716cb902bd20dedc705a8f81f6536736/Screen_Shot_2016-10-19_at_10.20.01_AM.png) ![Screen_Shot_2016-10-19_at_10.27.01_AM](/uploads/4228575f50990a88bc828037d8fb99f2/Screen_Shot_2016-10-19_at_10.27.01_AM.png) Closes #20892 See merge request !6994
2016-10-31Correct padding and alignment for reaction buttonstauriedavis
2016-10-28Change retry button colorAnnabel Dunstone Gray
2016-10-28Only remove right connector of first build of last stageAnnabel Dunstone Gray
2016-10-28Display last pipeline infoAnnabel Dunstone Gray
2016-10-28Fix mobile viewAnnabel Dunstone Gray
2016-10-28Finish styling commits viewAnnabel Dunstone Gray
2016-10-28Rearrange commit info viewAnnabel Dunstone Gray
2016-10-28edited stylesheet with mr modal fixes and added to changelogDimitrie Hoekstra
2016-10-27Merge branch '23866-builds-dropdown' into 'master' Fatih Acet
Increase z index on fixed mr tabs Before: <img src="/uploads/e890a4f185af87b66251d744fbe840d5/Screen_Shot_2016-10-26_at_11.58.45_AM.png" width="400px"> After: <img src="/uploads/0bbf72888f6a47bd3027ee7dfff542da/Screen_Shot_2016-10-26_at_11.58.28_AM.png" width="400px"> Closes #23866 See merge request !7124
2016-10-26Merge branch 'enable-scss-lint-pseudo-element' into 'master' Annabel Dunstone Gray
Enable PseudoElement in scss-lint ## What does this MR do? Enables `PseudoElement` in `.scss-lint.yml` ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Improve SCSS maintainability and consistency ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #23485 See merge request !7083
2016-10-26Merge branch '22746-fix-admin-users-mobile-view' into 'master' Annabel Dunstone Gray
Resolve "Admin/Overview/Users mobile view" ## What does this MR do? Fixes mobile layout issues on `/admin/users` page. * Fixes control element placement when long usernames or email addresses overflow their container * Fixes condensed dropdown menu (issue caused by acde2e30) Before: ![Screen_Shot_2016-09-28_at_3.29.11_PM](/uploads/82cd27c367653beb29425065685274dd/Screen_Shot_2016-09-28_at_3.29.11_PM.png) ![Screen_Shot_2016-09-29_at_23.36.40](/uploads/e739638506388be9c5a0709e5f22b298/Screen_Shot_2016-09-29_at_23.36.40.png) After: ![Screen_Shot_2016-10-24_at_11.55.32_PM](/uploads/ab6e49da85688d9fd2abc49de238a5bf/Screen_Shot_2016-10-24_at_11.55.32_PM.png) ## Are there points in the code the reviewer needs to double check? Ensure css changes don't have any side effects elsewhere in GitLab. (I don't think they would...) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22746 See merge request !7087
2016-10-26Rename retry link and update changelogAnnabel Dunstone Gray
2016-10-26Align header items; put retry button back in sidebar on mobileAnnabel Dunstone Gray
2016-10-26Add retry build button in page header, remove from sidebarAnnabel Dunstone Gray
2016-10-26Enable PseudoElement in scss-lintClement Ho