- 07 3月, 2016 5 次提交
-
-
由 Douwe Maan 提交于
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
-
由 Douwe Maan 提交于
# Conflicts: # app/models/note.rb
-
由 Douwe Maan 提交于
Remove unused DiffLine model Added in Mar 2014. Only usage removed in Sep 2014. See merge request !3105
-
由 Douwe Maan 提交于
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
-
由 Douwe Maan 提交于
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
-
- 06 3月, 2016 7 次提交
-
-
由 Achilleas Pipinellis 提交于
Add a TL;DR version in quickstart guide See merge request !3026
-
由 Robert Speicher 提交于
-
由 Robert Speicher 提交于
We've got all these polymorphic type-checking methods, might as well use 'em everywhere it makes sense.
-
由 Robert Speicher 提交于
Added in Mar 2014. Only usage removed in Sep 2014.
-
由 Robert Speicher 提交于
Reduce progress bar noise during brakeman run See merge request !3101
-
由 Robert Speicher 提交于
This method was duplicating default Rails behavior.
-
由 Robert Speicher 提交于
This method was added in Dec 2012, its single use was removed two days later, and it's been there ever since.
-
- 05 3月, 2016 21 次提交
-
-
由 Douwe Maan 提交于
Upgrade carrierwave to 0.10.0. Closes #2805 See merge request !3084
-
由 Dmitriy Zaporozhets 提交于
Issue sidebar mobile Fixes #13592 Fixes #14037 See merge request !3050
-
由 Sytse Sijbrandij 提交于
-
由 Robert Speicher 提交于
Properly display YAML front matter in Markdown See merge request !3072
-
由 Douwe Maan 提交于
Allow the initial admin to set a password Closes #1980 See merge request !3068
-
由 Robert Speicher 提交于
This filter will detect YAML Front Matter and convert it to an HTML table for prettier formatting.
-
由 Robert Speicher 提交于
Closes #1980
-
由 Douwe Maan 提交于
Factory cleanup Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/5880 See merge request !2847
-
由 Douwe Maan 提交于
Move `update_merge_request` ability to Developer Closes #13663 See merge request !3099
-
由 Peter Suschlik 提交于
-
由 Douwe Maan 提交于
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
-
由 Douwe Maan 提交于
In UsersController#calendar_activities, when Date isn't parsable, fallback to Date.today For some reason, GoogleBot accesses `/u/:username/calendar_activities` without a `:date` param, but then the view was trying to call `#to_s(:short)` which doesn't exist on `nil`, leading to the following Sentry report: https://sentry.gitlap.com/gitlab/gitlabcom/issues/1182/ See merge request !3074
-
由 Robert Speicher 提交于
Closes #13663
-
由 Jacob Schatz 提交于
ctrl+enter on mac correctly submits forms Closes #4177 See merge request !3089
-
由 Robert Speicher 提交于
-
由 Robert Speicher 提交于
-
由 Robert Speicher 提交于
-
由 Jacob Schatz 提交于
-
由 Jacob Schatz 提交于
-
由 Jacob Schatz 提交于
-
由 Jacob Schatz 提交于
Updated dropdown CSS This is a start on #3279 by updating the CSS for the dropdown menu. This doesnt include any CSS for the title bar or filter field ![Screen_Shot_2016-03-04_at_12.23.49](/uploads/6f2047ec1b72974334fa56e6895a32be/Screen_Shot_2016-03-04_at_12.23.49.png) See merge request !3092
-
- 04 3月, 2016 7 次提交
-
-
由 Rémy Coutable 提交于
[ci skip]
-
由 Jacob Schatz 提交于
Added tabindex to filter field Based on however I changed the tabindex of the search field so that it goes search field -> filter field & then back to browser default. I dont think we should override the default tabindex of the page too much. Closes #3706 See merge request !3093
-
由 Jacob Schatz 提交于
-
由 Jacob Schatz 提交于
-
由 Jacob Schatz 提交于
-
由 Jacob Schatz 提交于
-
由 Jacob Schatz 提交于
-