summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use internal commit status API to check if finishedGrzegorz Bizon2016-10-041-2/+2
|
* Fix async pipeline and remove unrelated changesGrzegorz Bizon2016-10-046-26/+16
|
* Make pipeline processing asynchronousKamil Trzcinski2016-10-037-23/+51
| | | | | | Conflicts: app/models/ci/pipeline.rb app/models/commit_status.rb
* Merge branch 'fix-sidebar' into 'master' Dmitriy Zaporozhets2016-10-033-9/+9
|\ | | | | | | | | | | | | | | | | | | | | Fix broken left sidebar navigation Sidebar navigation is broken and it's introduced in !6627. Sidebar pin and hamburger icons were `a` tag before with `#` link on them. That was the main reason why page jumps to top. !6627 was trying to prevent default action but it interferes with the navigation links. I don't want to tweak event listeners for sidebar, instead I just replaced `a` elements with `div` because I think there is no point to have them as `a`. /cc @dzaporozhets @jschatz1 PS: This MR basically reverts !6627. I don't want to add another revert commit instead I reverted it in my editor and committed. See merge request !6648
| * Fixes sidebar navigation.fix-sidebarFatih Acet2016-10-033-9/+9
| |
* | Merge branch '21225-wip-slash-command-for-mrs' into 'master' Rémy Coutable2016-10-0312-16/+196
|\ \ | |/ |/| | | | | | | | | | | | | | | | | Add a /wip slash command to toggle the 'WIP' prefix in the MR title ## Why was this MR needed? As explained in #21225, it prevents you from having to click through the entire edit form just to mark an MR as WIP. Closes #21225 See merge request !6259
| * Add a /wip slash commandThomas Balthazar2016-10-0312-16/+196
| | | | | | | | It toggles the 'WIP' prefix in the MR title.
* | Merge branch 'fix-broken-access_requests_finder_spec' into 'master' Robert Speicher2016-10-032-3/+3
|\ \ | | | | | | | | | | | | Fix broken specs after merging !6265 See merge request !6647
| * | Members::RequestAccessService is tricter on permissionsRémy Coutable2016-10-032-3/+3
|/ / | | | | | | | | | | Fortunately, only specs needed to be fixed, so that's good! Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '22851-keep-scroll-location-when-collapsing-sidebar' into 'master' Dmitriy Zaporozhets2016-10-032-5/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix page scrolling to top on sidebar toggle ## What does this MR do? Prevents page from scrolling to the top when a user clicks sidebar closing hamburger icon as well as when a user is toggling sidebar pinning. ## Why was this MR needed? When a user is closing the sidebar or pinning the sidebar the scroll position of the page should not be affected. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 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? Closes #22851 See merge request !6627
| * | Fix page scrolling to top on sidebar toggleLuke Howell2016-10-012-5/+8
| | | | | | | | | | | | | | | | | | | | | Added preventDefault for toggling sidebar off as well as for pinning and unpinning the sidebar. Closes #22851
* | | Merge branch 'document-need-owner-or-master-permission-for-initial-push' ↵Dmitriy Zaporozhets2016-10-031-0/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' document the need to be owner or have the master permission level for the initial push ## What does this MR do? It documents the new behavior as discussed on gitlab-org/gitlab-ce#22543, because the `/protected_branch` URL of empty repository is not available and could mislead users. ## Are there points in the code the reviewer needs to double check? Don't think so ## Why was this MR needed? When you create a repository on GitLab, command line instructions on its home page for the use case _"Existing folder or Git repository"_ invite you to `git push -u origin master`, but the very first push is now rejected if you are not `Owner` or attributed `Master` permission. ## Screenshots (if relevant) ![Capture_d_écran_2016-09-30_à_14.55.20](/uploads/6ee2d36b4a32cb3a5faa68a10c1813f0/Capture_d_écran_2016-09-30_à_14.55.20.png) ## 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 - [ ] 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 you do - 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? - new behavior was introduced here : gitlab-org/gitlab-ce@71dec8b1b61e9e194d242d37b39416b72020936b - lack of documentation was discussed at gitlab-org/gitlab-ce#22543 See merge request !6608
| * | updated missed indentationPierre-Alexandre Clorichel2016-09-301-1/+1
| | |
| * | document the need to be owner or have the master permission level for the ↵Pierre-Alexandre Clorichel2016-09-301-0/+2
| | | | | | | | | | | | initial push
* | | Merge branch 'patch-5' into 'master' Rémy Coutable2016-10-032-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use `fa-right-arrow` instead of `fa-check` as the current build indicator in the build sidebar for better UX. Closes #22499 See merge request !6501
| * | | Fixes #22499Gal Schlezinger2016-09-292-1/+2
| | | |
* | | | Merge branch '22773-add-comparison-link-to-system-note' into 'master' Dmitriy Zaporozhets2016-10-034-8/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to comparison from system note, update changelog ## What does this MR do? Adds a link to the comparison between the previous and latest version. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-10-01_at_3.37.03_AM](/uploads/89b48dc1b2ed868cf5dd85300e6b37a0/Screen_Shot_2016-10-01_at_3.37.03_AM.png) ## Does this MR meet the acceptance criteria? - [x] [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 - [x] 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? Closes #22773 See merge request !6607
| * | | | Remove duplicate testMatthewRDodds/gitlab-ce-22773-add-comparison-link-to-system-noteMatthew Dodds2016-10-011-4/+0
| | | | |
| * | | | Add a spec to verify comparison context inclusion in path when a version is ↵Matthew Dodds2016-10-011-2/+13
| | | | | | | | | | | | | | | | | | | | chosen to compare against
| * | | | Refactor url_helpers for system note service and remove duplication of logic ↵Matthew Dodds2016-09-302-18/+13
| | | | | | | | | | | | | | | | | | | | in spec
| * | | | Add link to comparison from system note, update changelogMatthew Dodds2016-09-293-4/+32
| | | | |
* | | | | Merge branch 'link-to-downtime-requires-from-migration-style-guide' into ↵Achilleas Pipinellis2016-10-021-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Link to the "What requires downtime?" page from the Migration Style Guide ## What does this MR do? Adds a link from migration style guide -> "What requires downtime?" ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The two pages really need to be read together, so having the link is helpful. ## Screenshots (if relevant) ## 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 - [ ] 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 you do - 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? See merge request !6636
| * | | | | Link to the "What requires downtime?" page from the Migration Style GuideNick Thomas2016-10-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'fix-issue-title-wrap' into 'master' Annabel Dunstone Gray2016-10-023-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add word-wrap to issue title on issue and milestone boards ## What does this MR do? Adds word-wrap to the issue title found on the issue board and the milestone boards ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Improves UI ## Screenshots (if relevant) Before: ![Screen_Shot_2016-09-19_at_10.19.18_AM](/uploads/7b79fe87c12c0d9a89fff5c725c546a4/Screen_Shot_2016-09-19_at_10.19.18_AM.png) ![Screen_Shot_2016-09-19_at_10.19.14_AM](/uploads/80a7e37433c98a406806249f01fe72fd/Screen_Shot_2016-09-19_at_10.19.14_AM.png) After: ![Screen_Shot_2016-09-19_at_10.18.54_AM](/uploads/e3a9420262a5d521478bea5601afafab/Screen_Shot_2016-09-19_at_10.18.54_AM.png) ![Screen_Shot_2016-09-19_at_10.19.04_AM](/uploads/b87d661bd1492777c4f677ea3ed09dcc/Screen_Shot_2016-09-19_at_10.19.04_AM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) 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 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? Closes #22274 See merge request !6412
| * | | | | | Add word-wrap to issue title on issue and milestone boardsClement Ho2016-10-013-0/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Fix RuboCop failure in app/services/notification_service.rbRobert Speicher2016-10-021-2/+7
| | | | | |
* | | | | | Merge branch ↵Robert Speicher2016-10-023-5/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'jimmykarily/gitlab-ce-notify_current_user_when_merging_an_mr_after_build_succeeds' into 'master' Notify current_user about automatic merge after successful build It enables notifications to the initiator of a merge when the MR is flagged as "Merge when build succeeds". Because when running Builds, quite some time passes between the user's action and the actual Merge so it is a good thing to notify the initiator of the Merge when it actually happens. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14409 See merge request !6534
| * | | | | | Notify current_user about automatic merge after successful buildDimitris Karakasilis2016-09-293-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/14409
* | | | | | | Merge branch ↵Robert Speicher2016-10-0225-219/+431
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '21983-member-add_user-doesn-t-detect-existing-members-that-have-requested-access' into 'master' Resolve "`Member.add_user`doesn't detect existing members that have requested access" ## What does this MR do? This merge request handle the case when an access requester is added to a group or project (via the members page or the API). In `Member.add_user`, if an access requester already exists, we simply accept their request (and set the `created_by`, `access_level` and `expires_at` attributes if given). ## Are there points in the code the reviewer needs to double check? I've taken the opportunity to cleanup the whole `{Group,Project}Member.add_user*` methods since it was quite a mess. ## What are the relevant issue numbers? Closes #21983 See merge request !6393
| * | | | | | | Use the new Members::ApproveAccessRequestService in Member#add_user21983-member-add_user-doesn-t-detect-existing-members-that-have-requested-accessRémy Coutable2016-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Allow Member.add_user to handle access requestersRémy Coutable2016-09-2825-219/+431
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes include: - Ensure Member.add_user is not called directly when not necessary - New GroupMember.add_users_to_group to have the same abstraction level as for Project - Refactor Member.add_user to take a source instead of an array of members - Fix Rubocop offenses - Always use Project#add_user instead of project.team.add_user - Factorize users addition as members in Member.add_users_to_source - Make access_level a keyword argument in GroupMember.add_users_to_group and ProjectMember.add_users_to_projects - Destroy any requester before adding them as a member - Improve the way we handle access requesters in Member.add_user Instead of removing the requester and creating a new member, we now simply accepts their access request. This way, they will receive a "access request granted" email. - Fix error that was previously silently ignored - Stop raising when access level is invalid in Member, let Rails validation do their work Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'rc-new-members-request-access-service' into 'master' Robert Speicher2016-10-029-14/+107
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New `Members::RequestAccessService` Part of #21979. See merge request !6265
| * | | | | | | Use AccessRequestable#request_access in MembershipActionsrc-new-members-request-access-serviceRémy Coutable2016-09-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Inverse condition in Members::RequestAccessServiceRémy Coutable2016-09-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Remove duplicate methodsRémy Coutable2016-09-222-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Re-add the AccessRequestable concernRémy Coutable2016-09-226-15/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | Fix specs that requires an access requestRémy Coutable2016-09-225-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | New Members::RequestAccessServiceRémy Coutable2016-09-2211-62/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'sort-within-labels' into 'master' Robert Speicher2016-10-022-11/+12
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preserve label filters when sorting ## What does this MR do? Allows Issues that are already filtered by labels to be sorted without losing the label filters. ## Why was this MR needed? Users don't expect to lose their label filters when sorting Issues. ## What are the relevant issue numbers? Closes #20982 See merge request !6136
| * | | | | | | Preserve label filters when sortingJoseph Frazier2016-09-302-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #20982 https://gitlab.com/gitlab-org/gitlab-ce/issues/20982
* | | | | | | | Merge branch ↵Annabel Dunstone Gray2016-10-012-2/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'AshleyDumaine/gitlab-ce-22494-wide-custom-header-logos-arent-centered' into 'master' Center the header logo _Originally opened at !6507 by @AshleyDumaine._ - - - ## What does this MR do? * Centers the header logo using `relative` positioning on the svg or img in the header-logo ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The custom wide header logos aren't centered after logging in as seen in #22494 ## Screenshots (if relevant) | Before | After | | --------- | ------ | | ![Screen_Shot_2016-09-24_at_3.35.26_PM](/uploads/576db77e0eb299b06d2a5abf341f058f/Screen_Shot_2016-09-24_at_3.35.26_PM.png) | ![Screen_Shot_2016-09-24_at_3.35.51_PM](/uploads/47237b6c28d438a6f255dffb8b3d39d4/Screen_Shot_2016-09-24_at_3.35.51_PM.png) | Signout (for centering comparison): ![Screen_Shot_2016-09-24_at_3.35.59_PM](/uploads/4484313ff5841774769c4737584af7fc/Screen_Shot_2016-09-24_at_3.35.59_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [ ] 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? Closes #22494 See merge request !6610
| * | | | | | | | Fix logo positioning on mobileAshleyDumaine/gitlab-ce-22494-wide-custom-header-logos-arent-centeredAnnabel Dunstone Gray2016-09-301-1/+5
| | | | | | | | |
| * | | | | | | | Center the header logoAshley Dumaine2016-09-302-1/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'fix-calendar-spec' into 'master' Jacob Schatz2016-10-011-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed zero padded days to no padded days in date_format ## What does this MR do? Changed zero padded days to no padded days in date_format so that calendar spec tests will pass. Specs were failing because it was looking for `Saturday Oct 01, 2016` when it should have been looking for `Saturday Oct 1, 2016` ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Fixes failing test ## 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 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? Closes #22861 See merge request !6634
| * | | | | | | | Changed zero padded days to no padded days in date_formatClement Ho2016-10-011-1/+3
|/ / / / / / / /
* | | | | | | | Merge branch '22221-tags-are-not-available-from-repository-compare-view' ↵Fatih Acet2016-10-015-18/+89
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Changed compare dropdowns to dropdowns with search input ## What does this MR do? This changes the compare dropdowns from text inputs, that when clicked, open a dropdown of branches/tags to dropdowns that have a dropdown toggle and an isolated search input. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? This was needed to fix the poor UX highlighted in #22221, where opening the dropdown showed an initially filtered set of results because the dropdown toggle was the dropdown filter itself. The compare page is always loaded with `master` as each branch/tag selection, so when opening the dropdown, it would only show results matching `master`. ## Screenshots (if relevant) ![2016-09-27_18.28.10](/uploads/0ea1d91cb592c6e140ed62c336e77227/2016-09-27_18.28.10.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 - [ ] 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 you do - 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 #22221 See merge request !6550
| * | | | | | | | Added temporary responsive design22221-tags-are-not-available-from-repository-compare-viewLuke Bennett2016-09-292-12/+56
| | | | | | | | |
| * | | | | | | | Changed compare dropdowns to dropdowns with isolated search inputLuke Bennett2016-09-275-14/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated compare specs
* | | | | | | | | Merge branch 'create-mr-banner' into 'master' Fatih Acet2016-10-0116-169/+193
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR banner & flash notices updates ### What does this MR do? * Moves the create MR banner below subnav * Changes MR banner background to white * Moves flash notices underneath subnav * Adds container within flash notices to align with content Closes #22767 ### Why was this MR needed? It looked a bit out of place between the two navs & had unneeded spacing. ### Screenshots (if relevant) Before: <img src="/uploads/c1676a1923893a7ba7e1c6d6a50d4ea6/Screen_Shot_2016-09-09_at_7.17.31_PM.png" width="800px"> After: <img src="/uploads/74a2d6c8c43b9a15cd535a2a7adb2685/Screen_Shot_2016-09-28_at_3.41.29_PM.png" width="800px"> Before: <img src="/uploads/285e3de31326c48de43bb48abd4d907c/Screen_Shot_2016-09-29_at_10.57.55_AM.png" width="800px"> After: <img src="/uploads/0877e3e45755e5ca36694c52ad2e6198/Screen_Shot_2016-09-29_at_10.56.04_AM.png" width="800px"> With both alert and broadcast message: ![Screen_Shot_2016-09-29_at_11.06.51_AM](/uploads/ba3963a73b5c82940533c369ec54ec50/Screen_Shot_2016-09-29_at_11.06.51_AM.png) See merge request !6581
| * | | | | | | | | Add flash containers and broadcast messages below subnavcreate-mr-bannerAnnabel Dunstone Gray2016-10-0113-159/+180
| | | | | | | | | |