summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Working version of autocomplete with categorized resultswip_issue_3400Alfredo Sumaran2016-03-086-49/+229
|
* Merge branch 'issue_13621_2' into 'master' Douwe Maan2016-03-0746-592/+423
|\ | | | | | | | | | | | | Labels should be visible in dashboard and group milestone views Closes #13621 See merge request !2931
| * Updates from last code review.issue_13621_2Rubén Dávila2016-03-0636-496/+317
| |
| * Add link with filter by milestone for labels and avatar.Rubén Dávila2016-03-041-2/+8
| | | | | | | | Closes #13628
| * Add some spinach specs.Rubén Dávila2016-03-042-2/+71
| |
| * Add missing partials!Rubén Dávila2016-03-042-0/+31
| |
| * Show some stats about Milestone according to the new UI.Rubén Dávila2016-03-042-10/+26
| |
| * Show Project name on Labels tab for Group and Dashboard context.Rubén Dávila2016-03-041-1/+8
| |
| * Use the same partial when rendering Issues or Merge Requests.Rubén Dávila2016-03-047-59/+10
| |
| * Make Merge Requests tab have the same look as Issues.Rubén Dávila2016-03-048-50/+26
| |
| * Show project name for Issues tab in Group and Dashboard context.Rubén Dávila2016-03-045-10/+17
| |
| * Refactor Milestone view for Dashboard.Rubén Dávila2016-03-045-70/+10
| |
| * Refactor Merge Requests tab into a custom partialRubén Dávila2016-03-046-15/+48
| | | | | | | | | | * Add Labels tab to Groups * Add decorator for label so it's aware of Milestones.
| * Refactor Merge Requests tab into a custom partialRubén Dávila2016-03-043-21/+10
| |
| * Eager load Issues/MRs project for Milestone.Rubén Dávila2016-03-044-4/+7
| | | | | | | | | | With this change we avoid doing N+1 queries when viewing Milestone's Issues/MRs from a Group context.
| * Refactor Merge Requests tab into a custom partialRubén Dávila2016-03-045-29/+20
| |
| * Recator Issues Tab into a custom partial.Rubén Dávila2016-03-045-24/+14
| |
| * Refactor GlobalMilestone queries.Rubén Dávila2016-03-048-18/+19
| | | | | | | | Make methods return ActiveRecord Relations instead of Arrays.
* | Merge branch 'feature/cross-project-labels' into 'master' Douwe Maan2016-03-0710-75/+128
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for cross project references for labels ## Summary Support for cross project references for labels. ## Rationale 1. Cross project label references are currently not supported in GitLab 1. `to_reference` method signature in `Label` model breaks the abstraction introduced in `Referable`. `concerns/referable.rb: def to_reference(_from_project = nil)` Signatures: ``` label.rb: def to_reference(format = :id) commit_range.rb: def to_reference(from_project = nil) commit.rb: def to_reference(from_project = nil) external_issue.rb: def to_reference(_from_project = nil) group.rb: def to_reference(_from_project = nil) issue.rb: def to_reference(from_project = nil) merge_request.rb: def to_reference(from_project = nil) milestone.rb: def to_reference(from_project = nil) project.rb: def to_reference(_from_project = nil) snippet.rb: def to_reference(from_project = nil) user.rb: def to_reference(_from_project = nil) ``` This MR suggests using `def to_reference(from_project = nil, format: :id)` which makes use of keyword arguments and preserves abstract interface. 1. We need support for cross project label references when we want to move issue to another project It may happen that issue description, system notes or comments contain reference to label and this reference will be invalid after moving issue to another project and will not be displayed correctly unless we have support for cross project references. Merge request that needs this feature: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2831 I think that cross project label references may be useful, (example: `Hey, see our issues for CI in GitLab CE! - gitab-org/gitlab-ce~"CI"`). cc @JobV @DouweM @rspeicher See merge request !2966
| * | Escape project's name in cross project labelfeature/cross-project-labelsGrzegorz Bizon2016-03-051-1/+1
| | |
| * | Remove redundant code in cross project labels implementationGrzegorz Bizon2016-03-032-7/+4
| | |
| * | Change content of cross project labelGrzegorz Bizon2016-03-032-5/+5
| | |
| * | Mention cross-project labels in markdown documentationGrzegorz Bizon2016-03-032-0/+5
| | |
| * | Add Changelog entry for cross-project label referencesGrzegorz Bizon2016-03-031-0/+1
| | |
| * | Improve cross project label look and feelGrzegorz Bizon2016-03-032-7/+14
| | |
| * | Add additional text prefix in cross project labelsGrzegorz Bizon2016-03-033-6/+17
| | |
| * | Add support for cross project references for labelsGrzegorz Bizon2016-03-033-55/+48
| | |
| * | Fix bug with return value in abstract reference filterGrzegorz Bizon2016-03-031-0/+2
| | | | | | | | | | | | | | | | | | | | | When `object_class.link_reference_pattern` was `nil` because object being processed do not implemement link references `call` method returned `nil` instead of returning document, even if document has been processed in for basic reference pattern.
| * | Add cross project references support for label modelGrzegorz Bizon2016-03-032-5/+45
| | |
| * | Add support for keyword arguments in label reference methodGrzegorz Bizon2016-03-035-11/+8
| | |
* | | Merge branch 'rs-factory-nitpicks' into 'master' Douwe Maan2016-03-0717-41/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | More Factory cleanup Addresses nitpicks from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2847 See merge request !3108
| * | | Remove unnecessary attribute definitions from Service factoryrs-factory-nitpicksRobert Speicher2016-03-061-2/+0
| | | |
| * | | Add traits for each access_level to ProjectMember factoryRobert Speicher2016-03-0615-30/+50
| | | |
| * | | Remove unused `another_email` factoryRobert Speicher2016-03-061-9/+1
| | | |
* | | | Merge branch 'indicate-mr-diverged-from-target' into 'master' Douwe Maan2016-03-078-5/+153
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Indicate when an MR diverged from the target branch This adds an indicator to the "Merge MR" box, to tell if and how much an MR diverged from its target branch. For instance, consider an MR to merge the branch `feature` into `master`. Some other commits were added to `master` since `feature` was created, and the two branches diverged. ```text o master | o o feature | | o o | / o ``` In this case, there will be a label in the MR Merge box stating: > This MR is by 3 commits behind the target branch `master`. ## Screenshots ### The branch diverged from the target (UI Proposal) ![UI_suggestion_1](/uploads/cd5bee3959e68026ec7d5097259d53f4/UI_suggestion_1.png) ### The branch diverged from the target (alternative UI Proposal) ![UI_suggestion_2](/uploads/f36977101b59a610850e129837dfbc83/UI_suggestion_2.png) ## How is this useful? - In a _rebase-workflow_ (MR are preferably rebased before being merged), the reviewer wants to know if an MR is rebased on the target branch before merging it. _With this indicator, the reviewer knows immediately if the branch is rebased, or if she needs to ask the committer to rebase its branch._ <br> - To keep the git history readable, a team prefers to avoid merging branches that really lag a lot behind the target branch. Merging an MR that is 10 commits behind is fine, but 200 is too much. _With this indicator, the reviewer can see on the MR page if the branch is really far behind the target – or only a few commits behind._ ## Open questions We've been using this at @captaintrain for a few months now, and found it quite useful. I guess the open-questions are mostly: what UI would be the more adequate? Any thoughts on this, on the general usefulness and/or on the code? See merge request !2217
| * | | | Indicate how much an MR branch diverges from the target branchPierre de La Morinerie2016-03-038-1/+146
| | | | |
| * | | | Tests: extract a merge_request_path helperPierre de La Morinerie2016-03-031-4/+7
| | | | |
* | | | | Merge branch 'rs-note-delegates-mentionable'Douwe Maan2016-03-071-10/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/note.rb
| * | | | | Delegate a Note's Mentionable methods to its noteable objectrs-note-delegates-mentionableRobert Speicher2016-03-051-10/+1
| | | | | |
* | | | | | Merge branch 'rs-remove-diffline' into 'master' Douwe Maan2016-03-071-3/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused DiffLine model Added in Mar 2014. Only usage removed in Sep 2014. See merge request !3105
| * | | | | | Remove unused DiffLine modelrs-remove-difflineRobert Speicher2016-03-051-3/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | Added in Mar 2014. Only usage removed in Sep 2014.
* | | | | | Merge branch 'rs-note-reuse-for-methods' into 'master' Douwe Maan2016-03-071-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make better use of the `Note#for_*?` methods We've got all these polymorphic type-checking methods, might as well use 'em everywhere it makes sense. See merge request !3106
| * | | | | | Make better use of the `Note#for_*?` methodsrs-note-reuse-for-methodsRobert Speicher2016-03-051-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | We've got all these polymorphic type-checking methods, might as well use 'em everywhere it makes sense.
* | | | | | Merge branch 'rs-note-model-cleanup' into 'master' Douwe Maan2016-03-071-8/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor Note model cleanup Remove `Note#noteable_type_name` This method was added in Dec 2012, its single use was removed two days later, and it's been there ever since. --- Remove `Note#system?` "override" This method was duplicating default Rails behavior. See merge request !3104
| * | | | | Remove `Note#system?` "override"rs-note-model-cleanupRobert Speicher2016-03-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | This method was duplicating default Rails behavior.
| * | | | | Remove `Note#noteable_type_name`Robert Speicher2016-03-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method was added in Dec 2012, its single use was removed two days later, and it's been there ever since.
* | | | | | Merge branch 'ci_quickstart' into 'master' Achilleas Pipinellis2016-03-061-11/+38
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a TL;DR version in quickstart guide See merge request !3026
| * | | | | Add a TL;DR version in quick start guideci_quickstartAchilleas Pipinellis2016-03-011-11/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Borrowed from a user's comment: https://gitlab.com/esr/reposurgeon/merge_requests/27#note_3158109 [ci skip]
* | | | | | Merge branch 'master' into 'master' Robert Speicher2016-03-051-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Reduce progress bar noise during brakeman run See merge request !3101
| * | | | | Reduce progress bar noise during brakeman runPeter Suschlik2016-03-041-1/+1
| | | | | |
View Lorry Controller Status