- 03 Apr, 2017 1 commit
-
-
James Edwards-Jones authored
-
- 20 Mar, 2017 1 commit
-
-
Jarka Kadlecova authored
-
- 14 Mar, 2017 1 commit
-
-
Ruben Davila authored
-
- 02 Mar, 2017 1 commit
-
- 01 Mar, 2017 1 commit
-
-
James Lopez authored
Rename column in the database Rename fields related to import/export feature Rename API endpoints Rename documentation links Rename the rest of occurrences in the code Replace the images that contain the words "build succeeds" and docs referencing to them Make sure pipeline is green and nothing is missing. updated doc images renamed only_allow_merge_if_build_succeeds in projects and fixed references more updates fix some spec failures fix rubocop offences fix v3 api spec fix MR specs fixed issues with partials fix MR spec fix alignment add missing v3 to v4 doc wip - refactor v3 endpoints fix specs fix a few typos fix project specs copy entities fully to V3 fix entity error more fixes fix failing specs fixed missing entities in V3 API remove comment updated code based on feedback typo fix spec
-
- 24 Feb, 2017 1 commit
-
-
Sean McGivern authored
Previously, we created an unmergeable todo when a merge request: 1. Had merge when pipeline succeeds set. 2. Became unmergeable. However, when merge when pipeline succeeds fails due to unmergeability, the flag isn't actually removed. And a merge request can become unmergeable multiple times, as every time the target branch is updated we need to re-check the mergeable status. This means that if the todo was marked done, and the MR was checked again, a new todo would be created for the same event. Instead of checking this, we should create the todo from the service responsible for merging when the pipeline succeeds. That way the todo is guaranteed to only be created when we care about it.
-
- 23 Feb, 2017 6 commits
-
-
Douwe Maan authored
This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9. # Conflicts: # .rubocop.yml # .rubocop_todo.yml # lib/gitlab/ci/config/entry/global.rb # lib/gitlab/ci/config/entry/jobs.rb # spec/lib/gitlab/ci/config/entry/factory_spec.rb # spec/lib/gitlab/ci/config/entry/global_spec.rb # spec/lib/gitlab/ci/config/entry/job_spec.rb # spec/lib/gitlab/ci/status/build/factory_spec.rb # spec/lib/gitlab/incoming_email_spec.rb
-
Douwe Maan authored
This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Sean McGivern authored
This was wrong when there were over 100 files in the diff, because we did not use the same diff options as subclasses of `Gitlab::Diff::FileCollection::Base` when getting the raw diffs. (The reason we don't use those classes directly is because they may perform highlighting, which isn't needed for just counting the diffs.)
-
- 14 Feb, 2017 1 commit
-
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 13 Feb, 2017 1 commit
-
-
Jan Christophersen authored
-
- 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
-
- 27 Jan, 2017 2 commits
-
-
Oswaldo Ferreira authored
-
Oswaldo Ferreira authored
-
- 18 Jan, 2017 1 commit
-
-
Dongqing Hu authored
-
- 14 Jan, 2017 1 commit
-
-
twonegatives authored
-
- 11 Jan, 2017 1 commit
-
-
Jarka Kadlecova authored
-
- 03 Jan, 2017 2 commits
-
-
Mike Greiling authored
-
James Lopez authored
Also added relevant specs and refactored to_references in a bunch of places to be more consistent.
-
- 30 Dec, 2016 1 commit
-
-
Valery Sizov authored
-
- 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
-
- 26 Dec, 2016 1 commit
-
-
Sean McGivern authored
We don't need to create the intermediate FileCollection object with its associated highlighting in order to count how many files changed. Both the compare object and the MR diff object have a raw_diffs method that is perfectly fine for this case.
-
- 19 Dec, 2016 1 commit
-
-
James Lopez authored
-
- 16 Dec, 2016 10 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
-
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
-
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
-