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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow primary email to be set to an email that you've already added.change-primary-email	Douwe Maan	2015-04-30	6	-18/+46
\|
*	Merge branch 'search-layout' into 'master'	Dmitriy Zaporozhets	2015-04-29	16	-133/+161
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements to search layout Improve search layout to match new UI style and make it more mobile-firendly See merge request !585
\| *	Fix tests	Dmitriy Zaporozhets	2015-04-29	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Move search categories (projects, issues etc) below search field. Instead ↵	Dmitriy Zaporozhets	2015-04-29	8	-81/+87
\| \| \| \| \| \| \| \| \| \| \| \|	use sidebar for dashbaord nav Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Continue refactoring and restyle of search layout	Dmitriy Zaporozhets	2015-04-28	10	-70/+98
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Draft improvements to search layout	Dmitriy Zaporozhets	2015-04-28	11	-115/+109
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Fix visibility settings UI in admin area	Dmitriy Zaporozhets	2015-04-29	1	-2/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-04-29	5	-148/+80
\|\ \
\| * \	Merge branch 'footnotes-markdown' into 'master'	Douwe Maan	2015-04-29	2	-1/+3
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add footnotes support to Markdown This merge request fix this issue : https://gitlab.com/gitlab-org/gitlab-ce/issues/555 See merge request !572
\| \| * \|	Add footnotes support to Markdown	Guillaume Delbergue	2015-04-24	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Guillaume Delbergue <guillaume.delbergue@greensocs.com>
\| * \| \|	Merge branch 'refactor-service-settings' into 'master'	Douwe Maan	2015-04-29	3	-147/+77
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move service template and project service settings into a shared view This MR reconciles the small differences in the error message layout between the template and project settings, and moves the partial into a shared view. This came from a mention in https://github.com/gitlabhq/gitlabhq/issues/9181 to take care of this. See merge request !588
\| \| * \| \|	Move service template and project service settings into a shared view	Stan Hu	2015-04-29	3	-147/+77
\| \|/ / /
* \| \| \|	Merge branch 'Add_phrase_close_multiple_issues' into 'master'	Sytse Sijbrandij	2015-04-29	1	-1/+3
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add phrase "Here's how to close multiple issues in one commit message" Added phrase "Here's how to close multiple issues in one commit message" so that doc is easier to find by users. cc/ @sytse See merge request !1801
\| * \| \|	Added phrase "Here's how to close multiple issues in one commit message" so ↵	Karen Carias	2015-04-28	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	that doc is easier to find by users
* \| \| \|	Merge branch 'fix_data' into 'master'	Dmitriy Zaporozhets	2015-04-29	2	-1/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove abandoned GroupMembers https://dev.gitlab.org/gitlab/gitlabhq/issues/2270#note_43457 See merge request !1802
\| * \| \| \|	Remove abandoned GroupMembers	Valery Sizov	2015-04-29	2	-1/+7
\|/ / / /
* \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-04-29	2	-2/+2
\|\ \ \ \
\| * \ \ \	Merge pull request #9220 from kylekatarnls/patch-1	Jeroen van Baarsen	2015-04-29	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix #9219 Affix menu size change
\| \| * \| \| \|	Fix #9219 Affix menu size change	Kyle	2015-04-29	1	-1/+1
\| \|/ / / /
\| * \| \| \|	Merge pull request #8677 from jubianchi/api-500-json	Jeroen van Baarsen	2015-04-28	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Send 500 errors as JSON in the API
\| \| * \| \|	Send 500 errors as JSON in the API	jubianchi	2015-04-27	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Dmitriy Zaporozhets	2015-04-29	3	-1/+19
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge branch 'fix-commit-data-url-generation' into 'master'	Douwe Maan	2015-04-28	3	-1/+19
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where commit data would not appear in some subdirectories Fix issue where commit data would not show up in some subdirectories due to escaped slashes. For example: https://gitlab.common-lisp.net/ecl/ecl/tree/develop/src/gc (now patched with fix) The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76ed) caused slashes in a tree to be escaped automatically. Using a wildcard glob in the route prevents this behavior. * Closes #1478, #1459 * Closes https://github.com/gitlabhq/gitlabhq/issues/9037 See merge request !581
\| \| * \| \|	Fix bug where commit data would not appear in some subdirectories	Stan Hu	2015-04-26	3	-2/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The upgrade from Rails v4.1.2 to v4.1.9 (76aad9b76ed) caused slashes in a tree to be escaped automatically. Using wildcard globs prevents this behavior. Closes #1478, #1459
* \| \| \| \|	Revert "Fix '.container or .container-fluid should be the first child inside ↵	Dmitriy Zaporozhets	2015-04-29	1	-2/+2
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of a .navbar' issue" This reverts commit 570594a469fe481060d312d9d90980c5f9289e2f.
* \| \| \|	Merge branch 'rs-issue-2269' into 'master'	Dmitriy Zaporozhets	2015-04-28	6	-52/+10
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate settings for default_url_options Closes #2269 See merge request !1797
\| * \| \| \|	Specs don't need to set default_url_options anymore	Robert Speicher	2015-04-27	2	-18/+0
\| \| \| \| \|
\| * \| \| \|	Set default_url_options in test environments too	Robert Speicher	2015-04-25	1	-11/+9
\| \| \| \| \|
\| * \| \| \|	Remove duplicate settings for default_url_options	Robert Speicher	2015-04-25	3	-23/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2269
* \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-04-28	8	-12/+27
\|\ \ \ \
\| * \ \ \	Merge pull request #8680 from jubianchi/dev-rerun-foreman	Jeroen van Baarsen	2015-04-28	3	-5/+14
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|	Add a rake task to automatically restart foreman when changes occur
\| \| * \| \|	Add a rake task to automatically restart foreman when changes occur	jubianchi	2015-04-27	3	-5/+14
\| \|/ / /
\| * \| \|	Merge pull request #8754 from jirutka/fix-project_name_regex	Jeroen van Baarsen	2015-04-27	3	-4/+8
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Fix (project_)name_regex to accept non-ASCII letters and dash
\| \| * \| \|	Fix (project_)name_regex to accept non-ASCII letters and dash	Jakub Jirutka	2015-04-27	3	-4/+8
\| \| \| \| \|
\| * \| \| \|	Merge pull request #8645 from chulkilee/hipchat-api-version	Dmitriy Zaporozhets	2015-04-27	2	-3/+5
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add api version property on hipchat service
\| \| * \| \| \|	Add api version property on hipchat service	Chulki Lee	2015-04-27	2	-3/+5
\| \| \|/ / /
* \| \| \| \|	Merge branch 'admin-add-group-members' into 'master'	Dmitriy Zaporozhets	2015-04-28	2	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix adding new group members from admin area Fix for #2222 Tests for this case already exists but it was green. It related to current way dealing with ajax selectbox. Improving tests might be a reason for another merge requests - everyone is welcome to participate. See merge request !1796
\| * \| \| \| \|	Fix adding new group members from admin area	Dmitriy Zaporozhets	2015-04-27	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Sytse Sijbrandij	2015-04-27	4	-6/+14
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'fix-relative-submodule-links-with-personal-projects' into 'master'	Dmitriy Zaporozhets	2015-04-27	3	-5/+13
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken file browsing with relative submodule in personal projects Git submodules with relative links work fine for projects in groups but not in personal projects. This patch fixes this issue. To reproduce the problem, go here: https://gitlab.com/andrewwu.tw/submodule-test/tree/master Closes https://github.com/gitlabhq/gitlabhq/issues/7554 See merge request !565
\| \| * \| \| \| \| \|	Fix broken file browsing with relative submodule in personal projects	Stan Hu	2015-04-23	3	-6/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/7554
\| * \| \| \| \| \| \|	Merge branch 'upgrade-dockerfile-7.10.0' into 'master'	Robert Schilling	2015-04-27	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade Docker build to v7.10.0 See merge request !568
\| \| * \| \| \| \| \|	Upgrade Docker build to v7.10.0	Stan Hu	2015-04-27	1	-1/+1
\| \| \| \|/ / / / \| \| \|/\| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docker-improvements' into 'master'	Sytse Sijbrandij	2015-04-28	1	-9/+35
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add more instructions on how to publish docker images yourself. See merge request !1800
\| * \| \| \| \| \|	Add more instuctions on how to publish docker images yourself.	Sytse Sijbrandij	2015-04-27	1	-9/+35
\|/ / / / / /
* \| \| \| \| \|	Revert "Added X-GitLab-Event header for web hooks"	Valery Sizov	2015-04-27	10	-32/+21
\| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 548f182814acd0f7a110e6c165c186e345901b00.
* \| \| \| \|	Merge pull request #9209 from Soullivaneuh/bootstrap-update	Jeroen van Baarsen	2015-04-27	1	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Bootstrap 3.3.4
\| * \| \| \| \|	Bootstrap 3.3.4	Sullivan SENECHAL	2015-04-27	1	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #9208 from Soullivaneuh/container-class	Jeroen van Baarsen	2015-04-27	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix .container position on navbar
\| * \| \| \| \| \|	Fix '.container or .container-fluid should be the first child inside of a ↵	Sullivan SENECHAL	2015-04-26	1	-2/+2
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	.navbar' issue