0a5b005da1
Fix blame view line groupings
...
Closes #2305
2015-08-20 01:27:29 -07:00
55fc58bda4
Merge branch '2fa-message-improvement' into 'master'
...
Improved 2FA warning message about lost codes
Fixes internal issue: https://dev.gitlab.org/gitlab/gitlabhq/issues/2472
The warning message now clearly states that access will be lost of the 2FA recovery codes are not saved.
/cc @sytses @JobV
See merge request !1175
2015-08-19 23:21:02 +00:00
475bb00bde
Improved 2FA warning message about lost codes
2015-08-19 18:13:01 -05:00
15cdf551fc
Show colored icons like in the admin listing
2015-08-19 13:47:03 +02:00
10d2281d73
Show label on archived projects
2015-08-19 13:47:03 +02:00
3ebbed25f0
Allow listing of archived projects
...
Resolves #9285
2015-08-19 13:46:59 +02:00
72a425fa66
Merge branch 'remove-satellites'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19 09:52:39 +02:00
a42c548a8d
Use File.join instead of Rails.root.join in HelpController
2015-08-18 09:08:03 -07:00
2b127c3fd2
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-18 06:46:44 -07:00
798f2fe19f
Merge branch 'mr-source-branch-clear-cache' into 'master'
...
Clear cache to prevent listing deleted branches after MR removes source branch
Closes #2272
See merge request !1160
2015-08-18 13:16:46 +00:00
692e381e0c
capitalize URL in "Home page URL"
2015-08-17 23:16:18 -07:00
f4cb6e438a
Merge branch 'code-import-error-ui-improvements' into 'master'
...
Improve error message display when project fails to import
Follow-up to !1134 .
New screenshot:
See merge request !1138
2015-08-17 23:31:51 +00: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
e02cff19ed
Fix typo in text when raise pre-receive exception
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 10:47:29 +02:00
3b93856e13
save repo empty state into variable for proper result
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 10:24:25 +02:00
87ec6ae3a5
Merge branch 'fix/redirect_after_sign_in' into 'master'
...
Fix redirection after sign in when using auto_sign_in_with_provider
Logic for redirect path moved to a filter. This allows it to run properly when the auto_sign_in_with_provider filter takes control.
See merge request !1146
2015-08-14 19:45:01 +00:00
317b7ad3e8
Merge pull request #9528 from revaret/Fixed_alignment_issue
...
Fix for #9527
2015-08-14 09:12:34 -07:00
a608e45e6b
Remove unnecessary file
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14 17:56:36 +02:00
9ea37cda3f
merge with support of pre-receive and post-receive hooks
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14 17:52:49 +02:00
d416a9d624
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-14 08:51:49 -07:00
88ab815b38
Update Flowdock integration to support new Flowdock API
...
Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.
2015-08-14 16:45:23 +02:00
f4149bcddc
Refactor how repository makes commit with pre/post receive hooks
2015-08-14 16:23:40 +02:00
6e808fc222
Clear cache to prevent listing deleted branches after MR removes source branch
...
Closes #2272
2015-08-14 07:09:25 -07:00
4e4866f255
Refactor pre/post receive commit services into one class
2015-08-14 16:04:17 +02:00
bacad39ef9
Make sure target has not changed during pre-receive hook
2015-08-14 15:22:48 +02:00
3483024d93
Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'
...
Disable internal issue tracker if external tracker in use
### What does this MR do?
This MR disables routes to the internal issue tracker if an external issue tracker (e.g. Redmine) is in use. A 404 page is returned if a user attempts to access any of the issue routes.
### Why was this MR needed?
Enabling the external issue tracker would still keep the internal one active, which would lead to odd behavior where users could create issues but not close them.
### What are the relevant issue numbers?
Closes #2006
See merge request !993
2015-08-14 11:01:43 +00: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
e58e75aa88
Fix: User search feature in admin area does not respect filters
2015-08-13 17:51:20 +03:00
22eddffd41
Fixed #9527
2015-08-13 19:48:10 +05:30
c8614cbbe7
Capture pre-receive exception
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-13 14:29:13 +02:00
00a33d67aa
Merge branch 'improve-hipchat-service-test' into 'master'
...
Provide more feedback what went wrong if HipChat service failed test
This MR adds support for displaying the error message during HipChat service test. Before an Error 500 would be displayed with no helpful remarks.
Screenshot:
Issue gitlab-com/support-forum#213
See merge request !1144
2015-08-13 11:43:44 +00:00
34690142bf
Implement commit transaction with pre-receive and post-receive hooks for web editor
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-13 12:57:24 +02:00
167ab75365
Merge branch 'bring-clonebar-back' into 'master'
...
Bring clone bar back
Screenshot:
See discussion in !1080
See merge request !1147
2015-08-13 10:56:01 +00:00
7d1c06793e
Merge branch 'note-query-information' into 'master'
...
Note query information
See merge request !1149
2015-08-12 23:36:29 +00:00
95f8f7c729
api: add 'system', 'upvote', and 'downvote' fields to note queries
...
This reverts commit 4c586dc7c2
2015-08-12 17:02:33 -04:00
518aa7dca6
Bring clone bar back
...
See discussion in !1080
2015-08-12 14:00:59 -07:00
6a82c9f018
Merge branch 'mr-merge-manually-2' into 'master'
...
Move merge manually text below merge widget
Replace !1121
Screenshot:
#### Before
#### After
See merge request !1141
2015-08-12 16:06:16 +00:00
fb6e8008c4
Fix redirection after sign in when using auto_sign_in_with_provider
...
Logic for redirect path moved to a filter.
2015-08-12 17:31:35 +02:00
2379057002
Provide more feedback what went wrong if HipChat service failed test
...
Issue gitlab-com/support-forum#213
2015-08-12 07:31:25 -07:00
8adf6ba8f5
Add merged label on branches page
2015-08-11 23:00:46 +02: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
ff10543403
Move merge manually text below merge widget
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 19:55:01 +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
eaba65fe50
Move command line insturction out of mr widget
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 19:24:42 +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
Stan Hu
Sytse Sijbrandij
Patricio Cano
Artem Sidorenko
Dmitriy Zaporozhets
Robert Speicher
Ben Bodenmiller
Douwe Maan
Boyan Tabakov
Valery Sizov
ranjith
Ben Boeckel
Alex Lossent
Florent (HP)
