Dmitriy Zaporozhets
50696ce1d3
Revert "Fix for #9527 "
2015-08-17 18:29:54 +02:00
Stan Hu
317b7ad3e8
Merge pull request #9528 from revaret/Fixed_alignment_issue
...
Fix for #9527
2015-08-14 09:12:34 -07:00
Dmitriy Zaporozhets
ec910c3307
Set max-width for README, issue and merge request description
...
It allows easier text reading on big screens
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-14 11:29:45 +02:00
ranjith
22eddffd41
Fixed #9527
2015-08-13 19:48:10 +05:30
Dmitriy Zaporozhets
cb6ad67f52
Merge branch 'check-out-branch-button' into 'master'
...
Add "Check out branch" button to the MR page.
I appreciated the thought behind adding the "Fetch this branch using ..." line, but not so much the implementation. I think a "Check out branch" button alongside the existing "Download as" makes more sense to get instructions on how to get the changes on your local machine, since that's pretty much what "Download as" does as well.
Like the "command line", the button opens the command line merge instructions modal. I've improved the text of that modal in !1120 .

It looks even better in combination with !1121 , which gets rid of the "If you want to ..." line:

cc @dzaporozhets @rspeicher
See merge request !1116
2015-08-11 17:49:06 +00:00
Dmitriy Zaporozhets
91836272fe
Merge branch 'mr-widget-text' into 'master'
...
Improve text of MR merge widget and manual merge modal
Modal with manual merge instructions:

Archived:

WIP:

Missing target branch:

Missing source branch:

Nothing to merge:

Checking ability to merge:

Conflicts when allowed to merge:

Conflicts when not allowed to merge:

Mergeable when allowed to merge:

Mergeable when not allowed to merge:

Merge in progress:

Merge failed:

Merged:

Closed:

cc @dzaporozhets @rspeicher
See merge request !1120
2015-08-11 19:24:50 +02:00
Dmitriy Zaporozhets
48e76c04a7
Refactor merge request widget
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-11 19:17:02 +02:00
Dmitriy Zaporozhets
3e0ba775ed
Move command line insturction out of mr widget
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-11 19:15:49 +02:00
Dmitriy Zaporozhets
fed202f677
Merge branch 'grit_blame' into 'master'
...
Fast blame
Improve performance for file blame page. Also bring some small UI improvements
See merge request !1129
2015-08-11 14:45:54 +00:00
Dmitriy Zaporozhets
50b1f09ab2
Small UI improvements to git blame page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-11 16:24:29 +02:00
Dmitriy Zaporozhets
84727fba96
Revert "Merge branch 'improve-merge-requests' into 'master'
"
...
This reverts commit 4773f38e28 , reversing
changes made to 0d5d80b735 .
2015-08-11 10:26:19 +02:00
Dmitriy Zaporozhets
f293d991a4
Revert "Merge branch 'mr-widget-text' into 'master'
"
...
This reverts commit 151d9fb35f , reversing
changes made to 819d110cab .
2015-08-11 10:26:12 +02:00
Douwe Maan
4a2b7cef57
Merge branch 'master' into check-out-branch-button
2015-08-10 14:16:40 +02:00
Dmitriy Zaporozhets
151d9fb35f
Merge branch 'mr-widget-text' into 'master'
...
Improve text of MR merge widget and manual merge modal
Modal with manual merge instructions:

Archived:

WIP:

Missing target branch:

Missing source branch:

Nothing to merge:

Checking ability to merge:

Conflicts when allowed to merge:

Conflicts when not allowed to merge:

Mergeable when allowed to merge:

Mergeable when not allowed to merge:

Merge in progress:

Merge failed:

Merged:

Closed:

cc @dzaporozhets @rspeicher
See merge request !1120
2015-08-10 12:13:26 +00:00
Stan Hu
77f37fa909
Merge branch 'dropzone-upload-progress' into 'master'
...
Add dropzone upload progress
This MR adds upload progress in percents to dropzone.

I thought, it can be nice small enhancement :)
See merge request !1125
2015-08-10 08:05:37 +00:00
Nikita Verkhovin
17bab5022f
Add dropzone upload progress
2015-08-10 13:18:02 +06:00
Douwe Maan
22285b1d39
Merge branch 'master' into check-out-branch-button
2015-08-09 17:41:31 +02:00
Douwe Maan
7b7802377e
Merge branch 'master' into mr-widget-text
2015-08-09 17:40:59 +02:00
Douwe Maan
e6bf9aa719
Make modal narrower
2015-08-09 17:34:28 +02:00
Douwe Maan
9049cdff5a
Add "Check out branch" button to the MR page.
2015-08-08 21:27:29 +02:00
Dmitriy Zaporozhets
1c3c232608
Revert "Put author name at the end of a tree row"
...
This reverts commit ee0fc2c3ad .
2015-08-07 18:12:15 +02:00
Dmitriy Zaporozhets
71158b11f2
Add more spacing between MR widget and tabs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-07 18:00:55 +02:00
Dmitriy Zaporozhets
fd2f907b01
Move command line insturction out of mr widget
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-07 16:04:17 +02:00
Dmitriy Zaporozhets
3cf4a981d6
Refactor merge request widget
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-08-07 15:17:10 +02:00
Douwe Maan
e2b4f13b9b
Add project name to project head
2015-08-06 15:10:51 +02:00
Dmitriy Zaporozhets
4b3b286eef
Merge branch 'tree-author-at-end' into 'master'
...
Put author name at the end of a tree row
Put author name at the end of a tree row as the commit message is more important than the author name.
See merge request !579
2015-08-06 08:59:25 +00:00
Kamil Trzciński
caf4c0dd87
Merge branch 'ci-skipped-status' into 'master'
...
Added support for CI skipped status
This is required to support: https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/216
See merge request !1073
2015-08-05 10:09:07 +00:00
Dmitriy Zaporozhets
6caa03d422
Merge remote-tracking branch 'public/project-buttons'
2015-08-05 11:18:28 +02:00
Sven Strickroth
ee0fc2c3ad
Put author name at the end of a tree row
...
Signed-off-by: Sven Strickroth <email@cs-ware.de >
2015-08-05 00:12:13 +02:00
Kamil Trzcinski
427b5df260
Added support for CI skipped status
2015-08-04 16:47:19 +02:00
Dmitriy Zaporozhets
cc4405db7d
Merge branch 'add-license'
2015-08-03 11:05:19 +02:00
Robert Speicher
1aa1f39248
Make code elements in links display as such
...
Also adds some minor padding to inline `code` elements.
2015-07-31 17:44:16 -04:00
Douwe Maan
7ba7652019
Tweak project page buttons.
2015-07-31 13:56:15 +02:00
Douwe Maan
0b5acdd88f
Show buttons to add license, changelog and contribution guide if they're missing.
2015-07-30 15:12:57 +02:00
Robert Speicher
12a913a93c
Make hrs more visible in note bodies
...
Closes #2107
2015-07-27 17:32:56 -04:00
Robert Speicher
cad0e848b0
Fix and style the "Changes suppressed" link.
2015-07-23 16:07:45 -04:00
Dmitriy Zaporozhets
2280cb23d4
Merge branch 'nice-scroll-sidebar' into 'master'
...
Add nice scroll for sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
See merge request !978
2015-07-14 10:48:21 +00:00
Dmitriy Zaporozhets
98cb6256fa
Add nice scroll for sidebar
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-14 12:29:57 +02:00
Kamil Trzcinski
2def2cc60a
Hide scrollbar from sidebar when external mouse is connected to OSX
2015-07-14 12:02:42 +02:00
Dmitriy Zaporozhets
24ecc9049f
Increase padding between menu items a bit
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-13 19:24:41 +02:00
Dmitriy Zaporozhets
a839b2afc4
Make sidebar scrollable. It prevents content overflow for small screens
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-13 19:23:15 +02:00
Dmitriy Zaporozhets
62da53af33
Hide icon for bact-to-location menu in sidebar
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-13 11:56:08 +02:00
Dmitriy Zaporozhets
8902253e0d
Smaller font and leing height for sidebar elements
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-10 15:33:10 +02:00
Robert Speicher
4498de4867
Reset ul list style types inside notes
...
Closes #259
2015-07-09 15:10:59 -04:00
Robert Speicher
df64e0db08
Style all blockquote children, not just p
...
Closes #1939
2015-07-09 14:50:09 -04:00
Dmitriy Zaporozhets
1bf3e1578a
Properly render plain readme
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-09 11:36:09 +02:00
Dmitriy Zaporozhets
17156cf909
Imrpove mobile view for project page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-08 13:34:05 +02:00
Dmitriy Zaporozhets
c2f02fc1a4
Refactor star and fork buttons
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-08 12:25:34 +02:00
Dmitriy Zaporozhets
5e7f7f8d31
Redesign project home page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-07 15:22:56 +02:00
Nicolás Reynolds
2662c7932a
commit hashes are monospaced
2015-07-01 13:33:29 -03:00