- 07 Feb, 2017 1 commit
-
-
Douwe Maan authored
-
- 06 Feb, 2017 2 commits
-
-
Douwe Maan authored
-
Douwe Maan authored
-
- 31 Jan, 2017 1 commit
-
-
Dongqing Hu authored
Remove MergeRequest#closes_issue?; Remove the default parameter value for #cache_merge_request_closes_issues! and #issues_mentioned_but_not_closing
-
- 19 Jan, 2017 1 commit
-
-
Robert Speicher authored
-
- 14 Jan, 2017 1 commit
-
-
twonegatives authored
-
- 13 Jan, 2017 1 commit
-
-
Jarka Kadlecova authored
-
- 11 Jan, 2017 1 commit
-
-
Jarka Kadlecova authored
-
- 03 Jan, 2017 1 commit
-
-
James Lopez authored
Also added relevant specs and refactored to_references in a bunch of places to be more consistent.
-
- 28 Dec, 2016 1 commit
-
-
Gabriel Gizotti authored
use MergeRequest#closes_issues instead of rewriting code to retrieve closing issues on MergeRequest#issues_mentioned_but_not_closing
-
- 16 Dec, 2016 7 commits
-
-
Gabriel Gizotti authored
Change closes issues reference text on MergeRequest#merge_commit_message to match existing text generated by the system
-
Gabriel Gizotti authored
Show either description or closes issues references on MergeRequest#merge_commit_message so closes issues references are not duplicated
-
Gabriel Gizotti authored
-
Gabriel Gizotti authored
-
Gabriel Gizotti authored
-
Gabriel Gizotti authored
-
Gabriel Gizotti authored
-
- 15 Dec, 2016 1 commit
-
-
Douwe Maan authored
Fix missing Note access checks in by moving Note#search to updated NoteFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867 ## Which fixes are in this MR?
- Potentially untested - No test coverage - Test coverage of some sort exists (a test failed when error raised) - Test coverage of return value (a test failed when nil used) - Permissions check tested ### Note lookup without access check - [x] app/finders/notes_finder.rb:13 :download_code check - [x] app/finders/notes_finder.rb:19 `SnippetsFinder` - [x] app/models/note.rb:121 [`Issue#visible_to_user`] - [x] lib/gitlab/project_search_results.rb:113 - This is the only use of `app/models/note.rb:121` above, but importantly has no access checks at all. This means it leaks MR comments and snippets when those features are `team-only` in addition to the issue comments which would be fixed by `app/models/note.rb:121`. - It is only called from SearchController where `can?(current_user, :download_code, @project)` is checked, so commit comments are not leaked. ### Previous discussions - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b915c5267a63628b0bafd23d37792ae73ceae272_13_13 `: download_code` check on commit - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b915c5267a63628b0bafd23d37792ae73ceae272_19_19 `SnippetsFinder` should be used - `SnippetsFinder` should check if the snippets feature is enabled -> https://gitlab.com/gitlab-org/gitlab-ce/issues/25223 ### Acceptance criteria met? - [x] Tests added for new code - [x] TODO comments removed - [x] Squashed and removed skipped tests - [x] Changelog entry - [ ] State Gitlab versions affected and issue severity in description - [ ] Create technical debt issue for NotesFinder. - Either split into `NotesFinder::ForTarget` and `NotesFinder::Search` or consider object per notable type such as `NotesFinder::OnIssue`. For the first option could create `NotesFinder::Base` which is either inherited from or which can be included in the other two. - Avoid case statement anti-pattern in this finder with use of `NotesFinder::OnCommit` etc. Consider something on the finder for this? `Model.finder(user, project)` - Move `inc_author` to the controller, and implement `related_notes` to replace `non_diff_notes`/`mr_and_commit_notes` See merge request !2035
-
- 05 Dec, 2016 1 commit
-
-
Bob Van Landuyt authored
When a merge request can only be merged when all discussions are resolved. This feature allows to easily delegate those discussions to a new issue, while marking them as resolved in the merge request. The user is presented with a new issue, prepared with mentions of all unresolved discussions, including the first unresolved note of the discussion, time and link to the note. When the issue is created, the discussions in the merge request will get a system note directing the user to the newly created issue.
-
- 02 Dec, 2016 1 commit
-
-
Oswaldo Ferreira authored
-
- 01 Dec, 2016 1 commit
-
-
Adam Niedzielski authored
when we care only about the number of commits We do not have to instantiate all objects in this case.
-
- 29 Nov, 2016 1 commit
-
-
Grzegorz Bizon authored
-
- 23 Nov, 2016 1 commit
-
-
Douwe Maan authored
-
- 21 Nov, 2016 2 commits
-
-
Rémy Coutable authored
Also allow merge request to be merged with skipped pipeline and the "only allow merge when pipeline is green" feature enabled Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Grzegorz Bizon authored
-
- 04 Nov, 2016 2 commits
-
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rodolfo Santos authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
- 24 Oct, 2016 2 commits
-
-
David Wagner authored
They were Rails' default and are unnecessarily overridden. Signed-off-by: David Wagner <david@marvid.fr>
-
Lin Jen-Shin authored
-
- 20 Oct, 2016 2 commits
-
-
Nick Thomas authored
-
Nick Thomas authored
This reverts commit 31c37c6c. See #23341
-
- 18 Oct, 2016 1 commit
-
-
Grzegorz Bizon authored
-
- 14 Oct, 2016 2 commits
-
- 13 Oct, 2016 1 commit
-
-
Sean McGivern authored
-
- 11 Oct, 2016 1 commit
-
-
tiagonbotelho authored
-
- 04 Oct, 2016 1 commit
-
-
Paco Guzman authored
We remove some arguments that are rarely used or used just to simplify setups on specs. Modified Mentionable#create_new_cross_references method we don’t need to calculate previous references to avoid the duplication because we do that at database level when creating references extracted from the current entity state. MergeRequests won’t create cross_references for commits that are included so we change a spec to use a different merge request to make references to commits to other branches
-
- 03 Oct, 2016 2 commits
-
-
Felipe Artur authored
-
Thomas Balthazar authored
It toggles the 'WIP' prefix in the MR title.
-
- 27 Sep, 2016 1 commit
-
-
Robert Speicher authored
Now a merge request with a blank description will no longer produce a merge commit message like this: ``` Merge branch 'foo' into 'master' Bring the wonders of foo into the world See merge request !7283 ``` What an improvement!
-