- 22 Jun, 2016 4 commits
-
-
Douwe Maan authored
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
-
Douwe Maan authored
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
😃 ## 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 -
Douwe Maan authored
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
-
Douwe Maan authored
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
-
- 21 Jun, 2016 36 commits
-
-
Douwe Maan authored
Update mail_room to 0.8.0 to resolve #13357 Update mail_room to 0.8.0 to resolve #13357 Which includes the fix from: https://github.com/tpitale/mail_room/pull/73 See merge request !4835
-
Dmitriy Zaporozhets authored
Resolve "Graphs and Wiki subnav" ## What does this MR do? Styles sub nav in `Wiki` and `Graphs` ## What are the relevant issue numbers? Closes #18533 ## Screenshots (if relevant) ![Screen_Shot_2016-06-15_at_9.32.43_AM](/uploads/111dae6e1b9c7d8038ac88b9be6f76a2/Screen_Shot_2016-06-15_at_9.32.43_AM.png) cc @dzaporozhets See merge request !4678
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
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
-
Jacob Schatz authored
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
-
Jacob Schatz authored
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
-
Robert Speicher authored
Update browser gem to 2.2.0 A user with a certain browser would hit an Error 500: ``` ArgumentError: invalid value for Float(): "0." from browser/accept_language.rb:45:in `Float' from browser/accept_language.rb:45:in `quality' from browser/accept_language.rb:15:in `each' from browser/accept_language.rb:15:in `sort_by' from browser/accept_language.rb:15:in `parse' from browser/base.rb:13:in `initialize' from browser.rb:125:in `new' from browser.rb:125:in `block in new' from browser.rb:125:in `map' from browser.rb:125:in `new' from browser/action_controller.rb:15:in `browser' from abstract_controller/helpers.rb:67:in `browser' from app/views/layouts/_head.html.haml:38:in `_app_views_layouts__head_html_haml__1626593241142487258_59224880' ``` The root cause when the `Accept-Language` header would contain a float for the quality value (e.g. en-GB,en;q=0.v5). Fixes https://github.com/fnando/browser/issues/241 Seen today via Sentry: https://sentry.gitlap.com/gitlab/gitlabcom/issues/7644/ See merge request !4811
-
Robert Speicher authored
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
-
Connor Shea authored
-
Connor Shea authored
Resolves #18894.
-
Robert Speicher authored
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
-
Annabel Dunstone authored
-
Achilleas Pipinellis authored
Add missing link to sidekiq metrics in API README See merge request !4837
-
Jacob Schatz authored
jQuery selector refactor in application.js. Minor refactor for unnecessarily repeated `$(document)` `$(window)` and `$('body')` See merge request !4809
-
Jacob Schatz authored
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
-
Achilleas Pipinellis authored
[ci skip]
-
Sean McGivern authored
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"
-
Lin Jen-Shin authored
Which includes the fix from: https://github.com/tpitale/mail_room/pull/73
-
Jacob Schatz authored
Capitalize button text Capitalizes button text to match the rest. See merge request !4834
-
Jacob Schatz authored
Fix admin appearance settings preview Render appearance settings preview in devise layout instead of implementing it 2 times. See merge request !4792
-
Jacob Schatz authored
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
-
Jacob Schatz authored
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
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Annabel Dunstone authored
-
Annabel Dunstone authored
-
Annabel Dunstone authored
-
Annabel Dunstone authored
-
Annabel Dunstone authored
-
Annabel Dunstone authored
-
Annabel Dunstone authored
-
Robert Speicher authored
Add missing import source I realised https://gitlab.com/projects/new is missing the `gitlab export` option, while this worked fine in GDK it seems that something was missing here. This _should_ fix it unless I'm missing any other `import_sources` (did a grep and couldn't find it anywhere else though). See merge request !4825
-
Alfredo Sumaran authored
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Merge request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4799
-
Dmitriy Zaporozhets authored
Align avatar and commit content within commit row ## What does this MR do? Aligns the user avatar on `Compare` ## What are the relevant issue numbers? Closes #18787 ## Screenshots (if relevant) <img src="/uploads/9525a599989f6a9faca54d9f9c62f755/Screen_Shot_2016-06-20_at_11.25.08_AM.png" width="800px"> <img src="/uploads/6c96ed629f377d69745548309006a520/Screen_Shot_2016-06-20_at_11.25.19_AM.png" width="800px"> See merge request !4764
-
Dmitriy Zaporozhets authored
-