72a425fa66
Merge branch 'remove-satellites'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19 09:52:39 +02:00
50696ce1d3
Revert "Fix for #9527"
2015-08-17 18:29:54 +02:00
4a0fa27017
Merge branch 'master' into remove-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 11:41:53 +02:00
317b7ad3e8
Merge pull request #9528 from revaret/Fixed_alignment_issue
...
Fix for #9527
2015-08-14 09:12:34 -07:00
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
22eddffd41
Fixed #9527
2015-08-13 19:48:10 +05:30
518aa7dca6
Bring clone bar back
...
See discussion in !1080
2015-08-12 14:00:59 -07:00
69c193e78a
Merge branch 'master' into remove-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 22:48:55 +02:00
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
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
48e76c04a7
Refactor merge request widget
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 19:17:02 +02:00
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
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
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
3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c82f706fbd23
2015-08-11 14:33:31 +02:00
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f416b9dbe9f5a
2015-08-11 10:28:42 +02:00
84727fba96
Revert "Merge branch 'improve-merge-requests' into 'master'
"
...
This reverts commit 4773f38e280d5d80b735
2015-08-11 10:26:19 +02:00
f293d991a4
Revert "Merge branch 'mr-widget-text' into 'master'
"
...
This reverts commit 151d9fb35f819d110cab
2015-08-11 10:26:12 +02:00
4a2b7cef57
Merge branch 'master' into check-out-branch-button
2015-08-10 14:16:40 +02:00
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
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
17bab5022f
Add dropzone upload progress
2015-08-10 13:18:02 +06:00
22285b1d39
Merge branch 'master' into check-out-branch-button
2015-08-09 17:41:31 +02:00
7b7802377e
Merge branch 'master' into mr-widget-text
2015-08-09 17:40:59 +02:00
e6bf9aa719
Make modal narrower
2015-08-09 17:34:28 +02:00
1309aeb871
Merge branch 'ui-improvements' into 'master'
...
Ui improvements
* revert of wrong patch
* spall margin change
Explanation with screenshots here - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/579#note_1845510
See merge request !1117
2015-08-09 08:30:48 +00:00
3f045b25d7
Fix transparency for msapplication-tile image
...
[ci skip]
2015-08-08 22:03:00 -04:00
9049cdff5a
Add "Check out branch" button to the MR page.
2015-08-08 21:27:29 +02:00
1c3c232608
Revert "Put author name at the end of a tree row"
...
This reverts commit ee0fc2c3ad
2015-08-07 18:12:15 +02:00
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
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
3cf4a981d6
Refactor merge request widget
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 15:17:10 +02:00
e2b4f13b9b
Add project name to project head
2015-08-06 15:10:51 +02:00
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
957e849f41
Merge branch 'drop-satellites'
2015-08-05 15:40:14 +02:00
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
6caa03d422
Merge remote-tracking branch 'public/project-buttons'
2015-08-05 11:18:28 +02:00
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
e9bbea7048
Don't hide the clone holder for an empty project
2015-08-04 16:58:14 -04:00
427b5df260
Added support for CI skipped status
2015-08-04 16:47:19 +02:00
b48b07044b
Merge branch 'master' into drop-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04 16:42:36 +02:00
cc4405db7d
Merge branch 'add-license'
2015-08-03 11:05:19 +02:00
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
7ba7652019
Tweak project page buttons.
2015-07-31 13:56:15 +02:00
0b5acdd88f
Show buttons to add license, changelog and contribution guide if they're missing.
2015-07-30 15:12:57 +02:00
12a913a93c
Make `hr`s more visible in note bodies
...
Closes #2107
2015-07-27 17:32:56 -04:00
dfe7807653
Fix live notes refresh in relative URL deployments
2015-07-26 09:54:53 -07:00
4a76cbe219
Merge branch 'fix-reload-with-full-diff-url' into 'master'
...
Fix the "Reload with full diff" URL button
On the first load, the merge request tabs would be requested in JSON format to render
the HTML. This would cause the "Reload with full diff" button to create a link to `diff.json`. Instead, generate the path in HTML mode.
Closes #2041
See merge request !1019
2015-07-25 15:38:23 +00:00
71a8c780ff
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-07-24 14:39:04 -07:00
70de5114fb
Merge branch 'auth-icons-labels' into 'master'
...
Allow custom label to be set for authentication providers.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2341
Beside the above, I've:
- Refactored `OauthHelper` to have clearer method names and behaviour
- Moved some of `OauthHelper` behaviour to `Gitlab::OAuth::Provider`
- Renamed `OauthHelper` to `AuthHelper` since LDAP, SAML, Kerberos aren't OAuth
- Updated the icons for GitHub and GitLab
In the examples below, "OurAuth" is a SAML provider with a custom label.
See merge request !927
2015-07-24 11:28:55 +00:00
Dmitriy Zaporozhets
Stan Hu
ranjith
Douwe Maan
Nikita Verkhovin
Robert Speicher
Kamil Trzciński
Sven Strickroth
Valery Sizov
