- 02 Jan, 2017 1 commit
-
-
dimitrieh authored
-
- 31 Dec, 2016 5 commits
-
-
Sam Rose authored
-
Kushal Pandya authored
-
Kushal Pandya authored
-
Kushal Pandya authored
-
Kushal Pandya authored
-
- 29 Dec, 2016 1 commit
-
-
Saad Shahd authored
-
- 28 Dec, 2016 3 commits
-
-
dimitrieh authored
-
Sam Rose authored
Use variables for display logic conditional checks
-
Grzegorz Bizon authored
-
- 21 Dec, 2016 7 commits
-
-
Bryce Johnson authored
-
Bryce Johnson authored
-
Filipa Lacerda authored
Adds MR id to changelor
-
Filipa Lacerda authored
Remove unused file Fix commit link
-
Filipa Lacerda authored
Fix specs
-
Alfredo Sumaran authored
-
Mike Greiling authored
-
- 16 Dec, 2016 7 commits
-
-
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
-
Gabriel Gizotti authored
-
- 15 Dec, 2016 2 commits
-
-
tauriedavis authored
-
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
-
- 14 Dec, 2016 1 commit
-
-
Alfredo Sumaran authored
This fixes the case when the user wants to add a label. The user has to use the dropdown’s filter input to look for a label and click it in order to see the bug. Step to reproduce - Select at least two issues, one label should be present in all issues, other label should be present in at least one. - On the label dropdown: Deselect label that is present in all issues, look for another issue using the filter input and click it. - Click on `Update issues` Before: Unmarked label were kept on selected issues. Now: Unmarked label is removed from selected issues
-
- 09 Dec, 2016 2 commits
-
-
Annabel Dunstone Gray authored
-
Victor Wu authored
-
- 07 Dec, 2016 1 commit
-
-
Rydkin Maxim authored
add link_to_if helper on target_branch link on Merge Request show page for case of deleted target branch add spec on #24507 bug description add changelog entry fix changelog remove unnecessary js:true from specs change spec title add test for link to target branch before deletions renamed spec about state of target branch link before and after deletion some fixes into spec
-
- 06 Dec, 2016 1 commit
-
-
Grzegorz Bizon authored
-
- 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.
-
- 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
-
- 28 Nov, 2016 2 commits
-
-
Adam Niedzielski authored
We do need these "ci-#{status}" classes because we use them in MergeRequestWidget to show correct divs.
-
Adam Niedzielski authored
-
- 21 Nov, 2016 4 commits
-
-
Dimitrie Hoekstra authored
-
Adam Niedzielski authored
nothing to merge in merge request page
-
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
-