0a5b005da1
Fix blame view line groupings
...
Closes #2305
2015-08-20 01:27:29 -07: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
4a0fa27017
Merge branch 'master' into remove-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 11:41:53 +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
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
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
69c193e78a
Merge branch 'master' into remove-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 22:48:55 +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
3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c82f706fbd23
2015-08-11 14:33:31 +02:00
d4cfa0bf76
Revert "Refactor web editor"
...
This reverts commit dfccb06dda
2015-08-11 11:49:09 +02:00
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f416b9dbe9f5a
2015-08-11 10:28:42 +02:00
5bdcdf5616
Fast blame
2015-08-11 09:15:00 +03:00
0c31701932
Merge branch 'bitbucket-show-incompatible' into 'master'
...
Show incompatible projects in Bitbucket import status
### What does this MR do?
This MR displays incompatible Bitbucket projects (e.g. SVN, hg) in the status table.
### Why was this MR needed?
Users are confused when they don't see projects show up. The import list should show incompatible projects as we do for Google Code to make it more obvious to the user what is happening. (See !586 and 9c76a6fahttps://gitlab.com/gitlab-org/gitlab-ce/uploads/264b080114c809c4a3a79580594af8b2/image.png )
### What are the relevant issue numbers?
#1871
See merge request !1114
2015-08-07 14:46:05 +00:00
d7accda1ae
Show incompatible projects in Bitbucket import status
...
See #1871
2015-08-07 07:07:08 -07:00
ad55f0d6f9
Merge branch 'master' into comment-updated-by
2015-08-07 15:05:17 +02:00
c5eb2977d7
Merge branch 'add-current-user-to-autocomplete' into 'master'
...
Always add current user to autocomplete controller to support filter by "Me"
### What does this MR do?
This MR always adds the current user to the autocomplete list of users.
### Why was this MR needed?
Normally only the members from a team or the group are shown in the autocomplete list. However, this prevents a user from filtering issues belong to him/her if the user does not belong directly to either. To make this filtering more usable, we can be sure to add the current user to the list, which the JavaScript code will move to the top of the list.
### What are the relevant issue numbers?
Partial fix #2202
See merge request !1100
2015-08-06 16:10:38 +00:00
dcb0bf0df5
Merge branch 'report-spam'
2015-08-06 18:07:36 +02:00
ed7a8c9221
Improve wording in abuse report form
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-06 15:15:17 +02:00
7a9d432cdb
Add abuse report management in admin area
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-06 15:08:22 +02:00
cba7f20dc8
Allow users to send abuse reports
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-06 14:03:27 +02:00
8b6ae0104d
Merge branch 'master' into comment-updated-by
2015-08-06 12:52:26 +02:00
863f61343a
Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'
...
Fix errors deleting, creating, and viewing graphs using branches with encoded slashes
* Closes #1804
* Closes #1359
See merge request !1084
2015-08-06 08:29:18 +00:00
70f5291808
Always add current user to autocomplete controller to support filter by "Me"
...
Partial fix #2202
2015-08-06 00:46:14 -07:00
957e849f41
Merge branch 'drop-satellites'
2015-08-05 15:40:14 +02:00
0c1ccda43f
Add "Confirm user" button in user admin page
...
Closes #2116
Closes https://github.com/gitlabhq/gitlabhq/issues/9502
2015-08-05 00:35:53 -07: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
208e07fe6f
Fix errors deleting and creating branches with encoded slashes
...
Closes #1804
2015-08-01 23:33:33 -07:00
bdb4288ab8
Merge branch 'mention-name-in-flash-msg' into 'master'
...
Mention group and project names in flash messages upon create, update and delete.
Mention group and project names in flash messages upon create, update and delete. I also changed some wording inconsistency.
**Before**
**After**
See merge request !1070
2015-07-31 13:29:38 +00:00
3307008499
Merge branch 'admin-group-member' into 'master'
...
Add specific ability for managing group members
To be used for https://dev.gitlab.org/gitlab/gitlab-ee/issues/290 (Internal issue)
See merge request !1059
2015-07-31 13:25:53 +00:00
04f2da3c37
Merge branch 'master' into comment-updated-by
2015-07-31 14:29:23 +02:00
0736f348a6
Use before_actions
2015-07-31 14:15:49 +02:00
36bd6c8494
Show who last edited a comment if it wasn't the original author
2015-07-30 14:45:54 +02:00
feb2865fba
Raise alert when group is deleted.
...
This change was made to match the project deletion.
2015-07-30 14:11:26 +03:00
369275d630
Fix network graph when branch name has single quotes
...
Closes https://github.com/gitlabhq/gitlabhq/issues/9500
2015-07-29 23:29:47 -07:00
0fac66f84d
Mention group and project name in flash messages upon create, update and delete.
2015-07-30 01:22:16 +03:00
f9bcb9632c
Add specific ability for managing group members
2015-07-28 16:32:15 +02:00
42ebd902de
Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
2015-07-28 15:33:16 +02:00
562242cb9d
Fix commit data retrieval when branch name has single quotes
...
Closes #1724
2015-07-26 03:47:01 -07:00
70a3c165a9
Allow custom label to be set for authentication providers.
2015-07-23 15:20:12 +02:00
643557dabc
Fix 404 error in files view after deleting the last file in a repository
...
Closes #1362
2015-07-21 14:12:43 -07:00
c61e7dd4ac
Public project activity page asks for sign-in
2015-07-20 13:54:56 +03:00
f33fe50f0d
Disable internal issue tracker if external tracker in use
...
Closes #2006
2015-07-17 22:59:31 -07:00
df2bb60f90
Add support for destroying project milestones
...
Closes https://github.com/gitlabhq/gitlabhq/issues/1504
2015-07-17 06:54:32 -07:00
a7fded9b95
Huge refactoring for accepting merge requests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 16:03:07 +02:00
26f5d6047d
Refactor compare and fetch logic
2015-07-15 17:28:09 +02:00
2a6f522cac
Implement merge from forks without satellites
2015-07-15 16:45:50 +02:00
a87989fb7d
Remove satellites
2015-07-15 15:45:57 +02:00
Stan Hu
Artem Sidorenko
Dmitriy Zaporozhets
Robert Speicher
Alex Lossent
Valery Sizov
Douwe Maan
Achilleas Pipinellis
