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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow subsequent validations in CI Linterfix/ci-linter-sequence-validations	Grzegorz Bizon	2016-01-11	2	-5/+7
\| \| \| \|	Closes #5851
*	Merge branch 'fix-build-status-caching' into 'master'	Dmitriy Zaporozhets	2016-01-11	1	-5/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix caching issue where build status was not updating in project dashboard The project dashboard page would show a stale build status since the caching key did not depend on it. Fix by adding the commit status if CI is applicable. Closes #3268 See merge request !2353
\| *	Fix caching issue where build status was not updating in project dashboard	Stan Hu	2016-01-08	1	-5/+8
\| \| \| \| \| \| \| \|	Closes #3268
* \|	Merge branch 'load-autocomplete-when-needed' into 'master'	Dmitriy Zaporozhets	2016-01-11	2	-12/+15
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only load autocomplete data when actually needed See merge request !2365
\| * \|	Only load autocomplete data when actually needed	Yorick Peterse	2016-01-11	2	-12/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously this would result in autocomplete data being loaded for every page (e.g. the page showing all Git branches of a project).
* \| \|	Merge branch 'fix-build-page-typo' into 'master'	Kamil Trzciński	2016-01-11	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in build page of projects The column containing links to the builds is named Runner but actually contains the Build. See merge request !2347
\| * \|	Fix typo in build page of projects	Steffen Köhler	2016-01-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The column containing links to the builds is named Runner but actually contains the Build ID. [ci skip]
* \| \|	Merge branch 'autocomplete-on-load' into 'master'	Dmitriy Zaporozhets	2016-01-11	1	-13/+12
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load autocomplete data when loading an issue page See merge request !2312
\| * \| \|	Load autocomplete data when loading an issue pageautocomplete-on-load	Yorick Peterse	2016-01-08	1	-13/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This ensures the dropdown is fully available the moment a user starts typing out a username, issue ID, etc. While this won't speed up loading the autocomplete data itself it should at least make it less annoying for the user.
* \| \| \|	Merge branch 'new-branch-position-fix' into 'master'	Dmitriy Zaporozhets	2016-01-11	2	-2/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes new branch button positioning, when visible and not visible container Fixes #5893 #5893 was not completely fixed. If a new branch was pushed the container is in correct position but if no container existed the position was incorrect. This MR fixes that. See merge request !2348
\| * \| \| \|	fixes new branch button positioning, when visible and not visible containernew-branch-position-fix	Jacob Schatz	2016-01-08	2	-2/+7
\| \|/ / /
* \| \| \|	Merge branch 'add-pencil-icon-to-group-page' into 'master'	Dmitriy Zaporozhets	2016-01-11	1	-3/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add pencil icon to edit group settings Move icons to upper-right corner of group page Before: ![image](/uploads/6694c33eae6e10a4e21efef465a07114/image.png) After: ![image](/uploads/0c17c2cf89fc0fde4344911b30f2635c/image.png) Closes #6038 See merge request !2361
\| * \| \| \|	Check for current user	Stan Hu	2016-01-10	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Add pencil icon to edit group settings	Stan Hu	2016-01-10	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move icons to upper-right corner of group page Closes #6038
* \| \| \| \|	Merge branch 'fix-duplicate-branch-activity' of ↵	Dmitriy Zaporozhets	2016-01-11	2	-2/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/stanhu/gitlab-ce
\| * \| \| \| \|	Fix duplicated branch creation/deletion events when using Web UI	Stan Hu	2016-01-08	2	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When deleting a branch, this is what was happening: 1. DeleteBranchService calls EventCreateService and creates an event. 2. The call to repository.rm_branch triggers the GitHooksService. 3. This, in turn, calls GitPushService and then calls EventCreateService again. 5145706c now makes it no longer necessary for DeleteBranchService and CreateBranchService to create an event. Closes #4304
* \| \| \| \| \|	Merge gitlab.com:gitlab-org/gitlab-ce	Jeroen Nijhof	2016-01-11	13	-38/+45
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'Issue#5817' into 'master'	Stan Hu	2016-01-11	2	-4/+4
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue#5817 Improve wording of the web hooks page on the project's setting Merge Request !2362 had a typo, I'm resubmitting the merge request about issue #5817. See merge request !2363
\| \| * \| \| \| \|	Issue #5817 wording of the web hooks updated on issue and merge events	iqualisoni	2016-01-11	2	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Before project save ensure that a runners_token exists	Stan Hu	2016-01-10	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix Error 500 when visiting build page of project with nil runners_token	Stan Hu	2016-01-10	2	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly ensure that the token exists and add defensively check for a non-nil value. Closes #4294
\| * \| \| \| \| \|	Merge branch 'fix_jira_shortterm' into 'master'	Robert Speicher	2016-01-10	1	-0/+3
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not call API if there is no API URL Fixes #5878 CE users may not be interested in the new JIRA features. In this case, we should detect they haven't set an API URL and fallback to the behavior pre-8.3. This patch does that very easily. There are planned improvements to JIRA in future releases such as gitlab-org/gitlab-ce#5541 which will make this more configurable. See merge request !2341
\| \| * \| \| \| \|	Do not call API if there is no API URL	Drew Blessing	2016-01-07	1	-0/+3
\| \| \|/ / / /
\| * \| \| \| \|	Disable "Already Blocked" button in admin abuse report page	Stan Hu	2016-01-09	1	-1/+1
\| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Merge branch 'cross-project-reference-typo-fix' into 'master'	Robert Speicher	2016-01-08	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changes verb `references` to noun `reference`. See merge request !2349
\| \| * \| \| \|	changes verb `references` to noun `reference`.cross-project-reference-typo-fix	Jacob Schatz	2016-01-08	1	-1/+1
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Remove Block Button from Abuse Reports page if User is Already Blocked	Robert Speicher	2016-01-08	1	-1/+4
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	An addition to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2292 Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/4667 See merge request !2313
\| \| * \| \| \|	Show that user is already blocked on Abuse Reportsfix-block-button-still-showing-on-abuse-reports-after-user-is-blocked	Kelvin	2016-01-06	1	-0/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Remove block button on abuse reports if user is already blocked	Kelvin	2016-01-06	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'api-project-upload' into 'master'	Robert Speicher	2016-01-08	4	-26/+19
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add API project upload endpoint Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317 See merge request !2329
\| \| * \| \| \| \|	DRY up upload and download servicesapi-project-upload	Douwe Maan	2016-01-08	3	-24/+17
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add API project upload endpoint	Douwe Maan	2016-01-07	3	-14/+14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'blacklist-new' into 'master'	Robert Speicher	2016-01-08	1	-0/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 'new' as a reserved namespace name Closes #5930 See merge request !2344
\| \| * \| \| \| \| \|	Blacklist 'new'blacklist-new	Robert Schilling	2016-01-08	1	-0/+1
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch 'suppress-allow-failure-builds' into 'master'	Stan Hu	2016-01-08	1	-1/+5
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suppress e-mails on failed builds if allow_failure is set Every time I push to GitLab, I get > 2 emails saying a spec failed when I don't care about the benchmarks and others that have `allow_failure` set to `true`. @ayufan mentioned creating a summary e-mail to prevent getting one e-mail per build, but the latter might actually be desirable. For example, I do want to know if Rubocop errors fail right away. See merge request !2178
\| \| * \| \| \| \|	Suppress e-mails on failed builds if allow_failure is set	Stan Hu	2016-01-07	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Every time I push to GitLab, I get > 2 emails saying a spec failed when I don't care about benchmarks and other specs that have `allow_failure` set to `true`.
* \| \| \| \| \| \|	Merge gitlab.com:gitlab-org/gitlab-ce	Jeroen Nijhof	2016-01-08	1	-6/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'docs_project_services' into 'master'	Achilleas Pipinellis	2016-01-08	1	-6/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project services and JIRA documentation clean up Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/176 This was first aiming to fix the JIRA references to EE, but as I was going through it, I decided to revamp more. @Haydn once merged here and then Valery merges CE into EE it should be fixed in doc.gitlab.com as well. @dblessing the docs state that we support JIRA 6.x. I see that 7.x is out, should the docs be amended? Also we seem to have a place to document services (http://doc.gitlab.com/ce/project_services/project_services.html), but the JIRA doc is under integration :/ I'd like it to have it moved under `project_services/`, but I guess most customers know the current URL better. See merge request !2345
\| \| * \| \| \| \| \|	Remove useless assignment to variable	Achilleas Pipinellis	2016-01-08	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Remove reference to EE from JIRA service model	Achilleas Pipinellis	2016-01-08	1	-5/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge gitlab.com:gitlab-org/gitlab-ce	Jeroen Nijhof	2016-01-08	74	-232/+324
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'accept-2xx-status-codes-for-webhooks' into 'master'	Dmitriy Zaporozhets	2016-01-08	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Accept 2xx status codes for successful Web hook triggers Closes https://github.com/gitlabhq/gitlabhq/issues/9956 See merge request !2332
\| \| * \| \| \| \| \| \|	Accept 2xx status codes for successful Web hook triggers	Stan Hu	2016-01-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/9956
\| * \| \| \| \| \| \| \|	Merge branch 'sorting-dropdown-order' into 'master'	Dmitriy Zaporozhets	2016-01-08	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	changes titles Fixes #5909 See merge request !2334
\| \| * \| \| \| \| \| \| \|	changes titlessorting-dropdown-order	Jacob Schatz	2016-01-07	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'cross-project-reference-move' into 'master'	Dmitriy Zaporozhets	2016-01-08	2	-10/+19
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	adds reference to the bottom of sidebar Fixes #4183 ![Screen_Shot_2016-01-07_at_3.17.32_PM](/uploads/8d71b475f1775d555cf5898921e86a1d/Screen_Shot_2016-01-07_at_3.17.32_PM.png) See merge request !2339
\| \| * \| \| \| \| \| \| \| \|	adds 85% width for textcross-project-reference-move	Jacob Schatz	2016-01-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	adds reference to the bottom of sidebar	Jacob Schatz	2016-01-07	2	-10/+19
\| \| \| \|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'banner-out-of-place' into 'master'	Dmitriy Zaporozhets	2016-01-08	2	-0/+2
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	css change to height to make gray container fit Fixes #5893 ![Screen_Shot_2016-01-07_at_1.22.53_PM](/uploads/7bdd44a71d255fa1439e5b96af0bd48b/Screen_Shot_2016-01-07_at_1.22.53_PM.png) See merge request !2337
\| \| * \| \| \| \| \| \| \|	css change to height to make gray container fitbanner-out-of-place	Jacob Schatz	2016-01-07	2	-0/+2
\| \| \| \|/ / / / / / \| \| \|/\| \| \| \| \| \|