BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
e8c9ccc2
Commit
e8c9ccc2
authored
Oct 14, 2016
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor merge requests revisions
- A system note now appears on every push - Replace dashes with underscores in images [ci skip]
parent
9a7afd2a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
10 deletions
+20
-10
versions_compare.png
doc/user/project/merge_requests/img/versions_compare.png
+0
-0
versions_dropdown.png
doc/user/project/merge_requests/img/versions_dropdown.png
+0
-0
versions_system_note.png
doc/user/project/merge_requests/img/versions_system_note.png
+0
-0
versions.md
doc/user/project/merge_requests/versions.md
+20
-10
No files found.
doc/user/project/merge_requests/img/versions
-
compare.png
→
doc/user/project/merge_requests/img/versions
_
compare.png
View file @
e8c9ccc2
File moved
doc/user/project/merge_requests/img/versions
-
dropdown.png
→
doc/user/project/merge_requests/img/versions
_
dropdown.png
View file @
e8c9ccc2
File moved
doc/user/project/merge_requests/img/versions_system_note.png
0 → 100644
View file @
e8c9ccc2
18.3 KB
doc/user/project/merge_requests/versions.md
View file @
e8c9ccc2
...
...
@@ -7,26 +7,36 @@ of merge request diff is created. When you visit a merge request that contains
more than one pushes, you can select and compare the versions of those merge
request diffs.
![
Merge Request Versions
](
img/versions.png
)
![
Merge request versions
](
img/versions.png
)
---
By default, the latest version of changes is shown. However, you
can select an older one from version dropdown.
![
Merge Request Versions
](
img/versions-dropdown.png
)
![
Merge request versions dropdown
](
img/versions_dropdown.png
)
---
You can also compare the merge request version with
older one to see what i
s
You can also compare the merge request version with
an older one to see what ha
s
changed since then.
![
Merge Request Versions
](
img/versions-compare.png
)
![
Merge request versions compare
](
img/versions_compare.png
)
---
Every time you push new changes to the branch, a link to compare the last
changes appears as a system note.
Please note that comments are disabled while viewing outdated merge versions
or comparing to versions other than base.
![
Merge request versions system note
](
img/versions_system_note.png
)
---
>**Note:**
Merge request versions are based on push not on commit. So, if you pushed 5
commits in a single push, it will be a single option in the dropdown. If you
pushed 5 times, that will count for 5 options.
>**Notes:**
-
Comments are disabled while viewing outdated merge versions or comparing to
versions other than base.
-
Merge request versions are based on push not on commit. So, if you pushed 5
commits in a single push, it will be a single option in the dropdown. If you
pushed 5 times, that will count for 5 options.
[
ce-5467
]:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5467
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment