delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \|	Import sources: show only enabled sources	Artem Sidorenko	2015-08-20	3	-1/+39
\| \|
* \|	Import sources: settings in the admin interface	Artem Sidorenko	2015-08-20	1	-0/+10
\|/
*	Allow listing of archived projects	Artem Sidorenko	2015-08-19	2	-0/+3
\| \| \| \|	Resolves #9285
*	Merge branch 'remove-satellites'	Dmitriy Zaporozhets	2015-08-19	3	-44/+37
\|\ \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Merge branch 'master' into remove-satellites	Dmitriy Zaporozhets	2015-08-17	3	-21/+27
\| \|\ \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \	Merge branch 'master' into remove-satellites	Dmitriy Zaporozhets	2015-08-11	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Revert "Merge branch 'revert-satellites' into 'master' "	Dmitriy Zaporozhets	2015-08-11	3	-44/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* \| \| \|	Use File.join instead of Rails.root.join in HelpController	Robert Speicher	2015-08-18	1	-2/+4
\| \|_\|/ \|/\| \|
* \| \|	Merge branch 'fix/redirect_after_sign_in' into 'master'	Stan Hu	2015-08-14	1	-18/+21
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Fix redirection after sign in when using auto_sign_in_with_provider	Alex Lossent	2015-08-12	1	-18/+21
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Logic for redirect path moved to a filter.
* \| \|	Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'	Dmitriy Zaporozhets	2015-08-14	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Disable internal issue tracker if external tracker in use	Stan Hu	2015-07-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2006
* \| \| \|	Provide more feedback what went wrong if HipChat service failed test	Stan Hu	2015-08-12	1	-2/+5
\| \|/ / \|/\| \| \| \| \| \| \| \|	Issue gitlab-com/support-forum#213
* \| \|	Merge branch 'grit_blame' into 'master'	Dmitriy Zaporozhets	2015-08-11	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fast blame Improve performance for file blame page. Also bring some small UI improvements See merge request !1129
\| * \|	Fast blame	Valery Sizov	2015-08-11	1	-1/+1
\| \| \|
* \| \|	Revert "Refactor web editor"	Dmitriy Zaporozhets	2015-08-11	1	-30/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit dfccb06dda344819989fa8d6a9a3c56c5ca0b65f. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Revert "Merge branch 'drop-satellites'"	Dmitriy Zaporozhets	2015-08-11	2	-7/+14
\|/ / \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'bitbucket-show-incompatible' into 'master'	Douwe Maan	2015-08-07	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 9c76a6fa). ### Screenshot ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/264b080114c809c4a3a79580594af8b2/image.png) ### What are the relevant issue numbers? #1871 See merge request !1114
\| * \|	Show incompatible projects in Bitbucket import status	Stan Hu	2015-08-07	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	See #1871
* \| \|	Merge branch 'master' into comment-updated-bycomment-updated-by	Douwe Maan	2015-08-07	3	-0/+37
\|\ \ \ \| \|/ /
\| * \|	Merge branch 'add-current-user-to-autocomplete' into 'master'	Dmitriy Zaporozhets	2015-08-06	1	-0/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \|	Always add current user to autocomplete controller to support filter by "Me"	Stan Hu	2015-08-06	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Partial fix #2202
\| * \| \|	Merge branch 'report-spam'	Dmitriy Zaporozhets	2015-08-06	2	-0/+35
\| \|\ \ \
\| \| * \| \|	Improve wording in abuse report form	Dmitriy Zaporozhets	2015-08-06	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Add abuse report management in admin area	Dmitriy Zaporozhets	2015-08-06	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Allow users to send abuse reports	Dmitriy Zaporozhets	2015-08-06	1	-0/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'master' into comment-updated-by	Douwe Maan	2015-08-06	8	-24/+36
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'	Douwe Maan	2015-08-06	1	-3/+4
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix errors deleting, creating, and viewing graphs using branches with encoded slashes * Closes #1804 * Closes #1359 See merge request !1084
\| \| * \| \|	Fix errors deleting and creating branches with encoded slashes	Stan Hu	2015-08-01	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1804
\| * \| \| \|	Merge branch 'drop-satellites'	Dmitriy Zaporozhets	2015-08-05	2	-14/+7
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| \| * \| \|	Merge branch 'master' into drop-satellites	Dmitriy Zaporozhets	2015-08-04	12	-16/+45
\| \| \|\ \ \ \| \| \| \|/ / \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Huge refactoring for accepting merge requests	Dmitriy Zaporozhets	2015-07-16	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Refactor compare and fetch logic	Dmitriy Zaporozhets	2015-07-15	2	-9/+3
\| \| \| \| \|
\| \| * \| \|	Implement merge from forks without satellites	Dmitriy Zaporozhets	2015-07-15	1	-1/+2
\| \| \| \| \|
\| \| * \| \|	Remove satellites	Dmitriy Zaporozhets	2015-07-15	1	-2/+0
\| \| \| \| \|
\| * \| \| \|	Add "Confirm user" button in user admin page	Stan Hu	2015-08-05	1	-0/+8
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2116 Closes https://github.com/gitlabhq/gitlabhq/issues/9502
\| * \| \|	Merge branch 'mention-name-in-flash-msg' into 'master'	Douwe Maan	2015-07-31	2	-7/+7
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 ![project_created](https://gitlab.com/axil/gitlab-ce/uploads/b91b92e46b08d6c566acee8d88fccff1/project_created.png) After ![project_created_after](https://gitlab.com/axil/gitlab-ce/uploads/56db5125f2769386c43cf9e2f175a54d/project_created_after.png) See merge request !1070
\| \| * \| \|	Raise alert when group is deleted.	Achilleas Pipinellis	2015-07-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change was made to match the project deletion.
\| \| * \| \|	Mention group and project name in flash messages upon create, update and delete.	Achilleas Pipinellis	2015-07-30	2	-7/+7
\| \| \| \| \|
\| * \| \| \|	Merge branch 'admin-group-member' into 'master'	Douwe Maan	2015-07-31	2	-0/+10
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \|	Use before_actions	Douwe Maan	2015-07-31	2	-4/+7
\| \| \| \| \| \|
\| \| * \| \| \|	Add specific ability for managing group members	Douwe Maan	2015-07-28	1	-0/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' into comment-updated-by	Douwe Maan	2015-07-31	1	-0/+4
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Fix network graph when branch name has single quotes	Stan Hu	2015-07-29	1	-0/+4
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/9500
* \| \| \| \|	Show who last edited a comment if it wasn't the original author	Douwe Maan	2015-07-30	1	-5/+2
\|/ / / /
* \| \| \|	Fix bug causing Bitbucket importer to crash when OAuth application had been ↵bitbucket-re-authorize	Douwe Maan	2015-07-28	1	-0/+1
\|/ / / \| \| \| \| \| \| \| \| \|	removed.
* \| \|	Fix commit data retrieval when branch name has single quotes	Stan Hu	2015-07-26	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #1724
* \| \|	Allow custom label to be set for authentication providers.auth-icons-labels	Douwe Maan	2015-07-23	3	-6/+7
\| \| \|
* \| \|	Fix 404 error in files view after deleting the last file in a repository	Stan Hu	2015-07-21	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #1362
* \| \|	Public project activity page asks for sign-inactivity_publicly_accessible	Valery Sizov	2015-07-20	1	-1/+1
\| \|/ \|/\|