summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Updated to add parenthesesref-dropdown-jquery-objectsPhil Hughes2016-06-222-7/+7
|
* Empty the content before append anything to the dropdownPhil Hughes2016-06-221-1/+3
|
* Use jQuery objects in ref dropdownPhil Hughes2016-06-222-12/+16
|
* Merge branch 'fix-network-links' into 'master' Douwe Maan2016-06-221-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Network graph links. ## What does this MR do? Fixes the Network graph links so they no longer link to `/master#{escape_javascript(@commit_url)}` ## Are there points in the code the reviewer needs to double check? Don't think so. ## Why was this MR needed? Single quotes don't evaluate Ruby expressions. ## What are the relevant issue numbers? Fixes #18894. cc: @jschatz1 See merge request !4832
| * Remove unnecessary string interpolation.fix-network-linksConnor Shea2016-06-211-1/+1
| |
| * Fix Network graph links.Connor Shea2016-06-211-1/+1
| | | | | | | | Resolves #18894.
* | Merge branch 'fix-auto-mr-close' into 'master' Douwe Maan2016-06-221-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix auto-MR-close text from branch name ## What does this MR do? Fix the MR-auto-close feature if a branch name begins with an issue IID. ## Are there points in the code the reviewer needs to double check? It's one line, so check that line thoroughly :smiley: ## Why was this MR needed? When I create a new MR from a branch starting with an issue IID, the description doesn't get suffixed with the 'Closes #blahblah' that it should do. ## What are the relevant issue numbers? Don't think there are any. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added See merge request !4836
| * | Fix auto-MR-close text from branch namefix-auto-mr-closeSean McGivern2016-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails's form helpers use the `$attr_before_type_cast` method where available, and this value only appears to be updated on assignment, not when the object is mutated in some other way: [1] pry(main)> mr = MergeRequest.new => #<MergeRequest:0x007fcf28395d88 ...> [2] pry(main)> mr.description = 'foo' => "foo" [3] pry(main)> mr.description << ' bar' => "foo bar" [4] pry(main)> mr.description => "foo bar" [5] pry(main)> mr.description_before_type_cast => "foo" [6] pry(main)> mr.description += ' bar' => "foo bar bar" [7] pry(main)> mr.description_before_type_cast => "foo bar bar"
* | | Merge branch ↵Douwe Maan2016-06-228-65/+35
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '18871-check-improve-how-we-display-access-requesters-in-admin-area' into 'master' Display group/project access requesters separately in admin ## What does this MR do? It displays the access requesters in a separate list in group & project members pages. It also harmonize the members counter UI to use `%span.badge` everywhere (in the admin & non-admin members views). ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? To not confuse access requesters with actual members. ## What are the relevant issue numbers? Closes #18871. ## Screenshots ### Group members | Before | After | | --------- | ---- | | ![group-members-before](/uploads/2f15137e073fd3a63bc2cb7b2217cb6c/group-members-before.png) | ![group-members-after](/uploads/5b643974505cfa57783fa0320d3bf8b2/group-members-after.png) | ### Project members | Before | After | | --------- | ---- | | ![project-members-before](/uploads/9c48dcd3736e42de84061b1201ee0b06/project-members-before.png) | ![project-members-after](/uploads/8e04c92ef0bba3de7e2405618632b27d/project-members-after.png) | ### Admin group members | Before | After | | --------- | ---- | | ![admin-group-members-before](/uploads/7fda8c2c94b697bea6655ba892ba45e7/admin-group-members-before.png) | ![admin-group-members-after](/uploads/ea25717001794f75939c679b80308c3a/admin-group-members-after.png) | ### Admin project members | Before | After | | --------- | ---- | | ![admin-project-members-before](/uploads/ba9d3ec52adbda6bb3d45ad9ac5243d3/admin-project-members-before.png) | ![admin-project-members-after](/uploads/3b889a029a9756e9ed2781b45c4dd9cb/admin-project-members-after.png) | ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG since this is related to the original "request access" MR. - [ ] All builds are passing - [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) See merge request !4798
| * | | Display group/project access requesters separately in adminRémy Coutable2016-06-208-65/+35
| | | | | | | | | | | | | | | | | | | | | | | | Also, reuse partials from the non-admin views. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch ↵Douwe Maan2016-06-2212-102/+71
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master' Resolve "Destroying a project causes post_decline_request to be executed" ## What does this MR do? Ensure we don't send "access request declined" to access requesters when a project is deleted. ## Are there points in the code the reviewer needs to double check? I've created a service to decouple the notification sending from the AR model. ## Why was this MR needed? Because there was an issue. ## What are the relevant issue numbers? Fixes #18755, #18750. ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG needed. - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing - [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) See merge request !4744
| * | | | Add 'Leave Group' linkRémy Coutable2016-06-181-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The link was removed in !3798, probably by mistake. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Show 'Leave project' only if member can actually leave the projectRémy Coutable2016-06-182-6/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Raise a new Gitlab::Access::AccessDeniedError when permission is not enough ↵Rémy Coutable2016-06-185-58/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to destroy a member This is a try for a new approach to put the access checks at the service level. Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Don't send the "access declined" email on access request withdrawalRémy Coutable2016-06-181-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Redirect to the member's source on request withdrawalRémy Coutable2016-06-181-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | Use the new Members::DestroyService in group/project member controllersRémy Coutable2016-06-182-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | New Members::DestroyServiceRémy Coutable2016-06-186-46/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to ensure we don't send unwanted notifications when deleting a project. In other words, stop abusing AR callbacks and use services. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'master' into 18533-graphs-wiki-subnavDmitriy Zaporozhets2016-06-2217-80/+79
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * \ \ \ \ Merge branch 'rename-code-to-repo' into 'master' Dmitriy Zaporozhets2016-06-211-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Code tab to Repository As discussed in #18830, this renames the "Code" tab to "Repository". Screenshot now: ![image](/uploads/a7807dfb5b42f037fe2a44475a4af883/image.png) See merge request !4807
| | * | | | | Rename Repo -> Repositoryrename-code-to-repoStan Hu2016-06-211-2/+2
| | | | | | |
| | * | | | | Rename Code tab to RepoStan Hu2016-06-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #18830
| * | | | | | Merge branch 'contributors-graph-mobile' into 'master' Jacob Schatz2016-06-212-1/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply responsive design for Contributors graphs. ## What does this MR do? Makes the Contributors graphs work on mobile. ## Are there points in the code the reviewer needs to double check? That this doesn't break on any screen sizes. ## Why was this MR needed? It used to be squished and impossible to read. ## What are the relevant issue numbers? Fixes #18845. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-18_at_1.00.58_PM](/uploads/bc17df5dabed0085c8ffdca303a502a5/Screen_Shot_2016-06-18_at_1.00.58_PM.png) After: ![Screen_Shot_2016-06-20_at_9.21.03_AM](/uploads/a0307cb255646800d0e4c8647769f7b6/Screen_Shot_2016-06-20_at_9.21.03_AM.png) cc: @jschatz1 See merge request !4801
| | * | | | | | Apply responsive design for Contributors graphs.contributors-graph-mobileConnor Shea2016-06-202-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18845.
| * | | | | | | Merge branch '18934-compare-gray-block' into 'master' Jacob Schatz2016-06-213-19/+35
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gray block under subnav to match other pages ## What does this MR do? Makes Compare sub nav full width; replaces gray block with white one to match rest of pages ## What are the relevant issue numbers? Closes #18934 ## Screenshots (if relevant) ![Screen_Shot_2016-06-21_at_1.14.46_PM](/uploads/43377efe7816b854f48966bcbd96a1cc/Screen_Shot_2016-06-21_at_1.14.46_PM.png) cc @dzaporozhets See merge request !4838
| | * | | | | | | Update gray block under subnav to match other pages18934-compare-gray-blockAnnabel Dunstone2016-06-213-19/+35
| | | | | | | | |
| * | | | | | | | Merge branch '17671-private-forks-list-ui-issues' into 'master' Robert Speicher2016-06-212-6/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed private forks notice position in forks list Moves the private forks notification item into the list on the forks page. Closes #17671. See merge request !4573
| | * | | | | | | | Moved private forks notice to projects-list so its above the pagination and ↵Luke "Jared" Bennett2016-06-102-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inline with list Updated CHANGELOG Removed CHANGELOG entry
| * | | | | | | | | Merge branch 'remove-banzai-pre-process' into 'master' Robert Speicher2016-06-211-2/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move pre_process into render_result This MR moves `Banzai::Renderer.pre_process` into `Banzai::Renderer.render_result`. The `pre_process` method was called even when its output would be ignored. See 11a5a4f359ee57029dbfcc9185fc6b47243ea2aa for more details. See merge request !4830
| | * | | | | | | | | Move pre_process into render_resultremove-banzai-pre-processYorick Peterse2016-06-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method Banzai::Renderer.pre_process would always be called, regardless of whether the Markdown to render was already cached or not. In cache the document _was_ cached the output of the pre-processing pipeline was ignored resulting in it doing nothing but wasting CPU cycles. This commit moves Banzai::Renderer.pre_process into Banzai::Renderer.render_result so that it's _only_ used when needed.
| * | | | | | | | | | Merge branch 'selector-refactor' into 'master' Jacob Schatz2016-06-211-14/+19
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jQuery selector refactor in application.js. Minor refactor for unnecessarily repeated `$(document)` `$(window)` and `$('body')` See merge request !4809
| | * | | | | | | | | jQuery selector refactor in application.js.selector-refactorFatih Acet2016-06-211-14/+19
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'nav-count-alignment-ff' into 'master' Jacob Schatz2016-06-211-1/+0
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with navbar counts being misaligned ## What does this MR do? Fixes an issue in FireFox with the number counts being mis-aligned. ## What are the relevant issue numbers? Closes #18916 ## Screenshots (if relevant) ![Screen_Shot_2016-06-21_at_15.56.51](/uploads/1d07543c14215e9e15facacc96aa3564/Screen_Shot_2016-06-21_at_15.56.51.png) See merge request !4829
| | * | | | | | | | | Fixed issue with navbar counts being misalignednav-count-alignment-ffPhil Hughes2016-06-211-1/+0
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #18916
| * | | | | | | | | Merge branch 'fix-button-title' into 'master' Jacob Schatz2016-06-211-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capitalize button text Capitalizes button text to match the rest. See merge request !4834
| | * | | | | | | | | Capitalize button textfix-button-titleAlfredo Sumaran2016-06-211-1/+1
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'dz-fix-appearance-preview' into 'master' Jacob Schatz2016-06-213-28/+9
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix admin appearance settings preview Render appearance settings preview in devise layout instead of implementing it 2 times. See merge request !4792
| | * | | | | | | | | Fix admin appearance settings previewdz-fix-appearance-previewDmitriy Zaporozhets2016-06-203-28/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Merge branch 'date-picker-hover' into 'master' Jacob Schatz2016-06-211-4/+6
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed hover of date picker calendar ## What does this MR do? Fixes the hover styling of days on the datepicker dropdown in the issuable sidebar. ## Screenshots (if relevant) ![hover](/uploads/2514dc772187da33c54f8b6324202189/hover.gif) See merge request !4786
| | * | | | | | | | | | Fixed hover of date picker calendardate-picker-hoverPhil Hughes2016-06-201-4/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch '18854-prio-labels-on-mobile' into 'master' Jacob Schatz2016-06-211-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes labels view on mobile ## What does this MR do? Fixes priority labels view on mobile ## What are the relevant issue numbers? Fixes #18854 ## Screenshots (if relevant) <img src="/uploads/f75be3a2788858f12a63820559f20886/Screen_Shot_2016-06-20_at_2.23.26_PM.png" width="487"> See merge request !4806
| | * | | | | | | | | | | Fixes labels view on mobile18854-prio-labels-on-mobileAlfredo Sumaran2016-06-201-2/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Put wiki page history content into containerDmitriy Zaporozhets2016-06-211-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | Add new page button to wiki home18533-graphs-wiki-subnavAnnabel Dunstone2016-06-211-0/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Move new page link out of sub navAnnabel Dunstone2016-06-213-7/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | Add new style for sub header block infoAnnabel Dunstone2016-06-218-11/+18
| | | | | | | | | | | | |
* | | | | | | | | | | | | Fix graph columnsAnnabel Dunstone2016-06-212-5/+14
| | | | | | | | | | | | |
* | | | | | | | | | | | | Style wiki sub nav linksAnnabel Dunstone2016-06-217-84/+95
| | | | | | | | | | | | |
* | | | | | | | | | | | | Style sub nav links in GraphsAnnabel Dunstone2016-06-215-107/+118
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'li-fade'Dmitriy Zaporozhets2016-06-216-12/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Merge request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4799