summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'issue_2805' into 'master' Douwe Maan2016-03-052-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade carrierwave to 0.10.0. Closes #2805 See merge request !3084
| * | | | | | | | | | | | | | | | | Upgrade carrierwave to 0.10.0.issue_2805Rubén Dávila2016-03-032-3/+4
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'issue-sidebar-mobile' into 'master' Dmitriy Zaporozhets2016-03-0512-49/+143
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue sidebar mobile Fixes #13592 Fixes #14037 See merge request !3050
| * | | | | | | | | | | | | | | | | | Uses the correct variable names for this situation.issue-sidebar-mobileJacob Schatz2016-03-041-2/+2
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Only save right sidebar position cookie if user did the collapsing.Jacob Schatz2016-03-042-6/+7
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fixes style consistencies.Jacob Schatz2016-03-043-10/+9
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix remaining media queries using correct bs paradigms.Jacob Schatz2016-03-042-14/+13
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Correct media queries for small devices and tablets.Jacob Schatz2016-03-043-9/+13
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Sidebar overflow on xs side.Jacob Schatz2016-03-042-7/+7
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Combining recent change to have username in header with my MR.Jacob Schatz2016-03-042-6/+13
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix bugs with open and close buttonsJacob Schatz2016-03-044-22/+27
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Small outside aside shrink sidebar button for mobile only.Jacob Schatz2016-03-042-1/+14
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Open sidebar button on mobile.Jacob Schatz2016-03-044-6/+25
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Move static icon and change appearance.Jacob Schatz2016-03-044-13/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MR meta details media queries.
| * | | | | | | | | | | | | | | | | | Hide correct author info in header of issuable.Jacob Schatz2016-03-042-4/+10
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Change icons for open close on issue/MRJacob Schatz2016-03-046-21/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Button full width on phone on MR/issue.
* | | | | | | | | | | | | | | | | | | No options please.Sytse Sijbrandij2016-03-041-1/+2
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'rs-frontmatter-pre' into 'master' Robert Speicher2016-03-056-0/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly display YAML front matter in Markdown See merge request !3072
| * | | | | | | | | | | | | | | | | | | Add YamlFrontMatterFilter to the PreProcessPipelineRobert Speicher2016-03-043-1/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This filter will detect YAML Front Matter and convert it to an HTML table for prettier formatting.
| * | | | | | | | | | | | | | | | | | | Add a PreProcessPipelineRobert Speicher2016-03-024-0/+28
| | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'rs-no-default-credentials' into 'master' Douwe Maan2016-03-044-25/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the initial admin to set a password Closes #1980 See merge request !3068
| * | | | | | | | | | | | | | | | | | | Allow the initial admin to set a passwordrs-no-default-credentialsRobert Speicher2016-03-044-25/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #1980
* | | | | | | | | | | | | | | | | | | | Merge branch 'rs-organize-factories' into 'master' Douwe Maan2016-03-0441-266/+255
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factory cleanup Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/5880 See merge request !2847
| * | | | | | | | | | | | | | | | | | | | Don't generate factories automaticallyRobert Speicher2016-03-041-0/+4
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Move all factory definitions to their own fileRobert Speicher2016-03-0438-258/+243
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Bump factory_girl_rails to ~> 4.6.0Robert Speicher2016-03-042-8/+8
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'rs-update_merge_request' into 'master' Douwe Maan2016-03-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move `update_merge_request` ability to Developer Closes #13663 See merge request !3099
| * | | | | | | | | | | | | | | | | | | Move `update_merge_request` ability to DeveloperRobert Speicher2016-03-041-1/+1
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #13663
* | | | | | | | | | | | | | | | | | | Merge branch 'rs-wiki-pipeline-spec' into 'master' Douwe Maan2016-03-043-47/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a spec for WikiPipeline Removes the specs from GollumTagsFilter that were more like integration tests for the pipeline than unit tests of the filter. See merge request !3054