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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Added tests for Repository#build_cacheproject-cache-worker-without-diverging	Yorick Peterse	2016-03-17	1	-0/+30
\|
*	Don't rebuild diverging commit count caches	Yorick Peterse	2016-03-17	1	-6/+0
\| \| \| \| \| \| \| \| \|	When calling Repository#build_cache we _don't_ want to build the diverging commit count cache as doing so can be _very_ slow for repositories with lots of branches. Because these caches are built whenever needed (= when actually viewing the list of branches in the web UI) we can safely remove this code from Repository#build_cache.
*	Removed Repository#rebuild_cache	Yorick Peterse	2016-03-17	1	-12/+0
\| \| \| \|	This method is not used or tested anywhere.
*	Merge branch 'edited-text' into 'master'	Robert Speicher	2016-03-17	6	-18/+29
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Edited timeago text on comments Unified the 'edited text' to be the same in descriptions and comments Closes #5538 See merge request !3063
\| *	Added skip_js commentedited-text	Phil Hughes	2016-03-16	1	-0/+1
\| \| \| \| \| \| \| \|	[ci skip]
\| *	Fixed failing rubocop test	Phil Hughes	2016-03-10	1	-5/+5
\| \|
\| *	Fixed issue with timeago not firing	Phil Hughes	2016-03-10	5	-7/+24
\| \|
\| *	Single if statement	Phil Hughes	2016-03-10	1	-5/+3
\| \|
\| *	Fixed ruby issues from feedback	Phil Hughes	2016-03-10	5	-28/+12
\| \| \| \| \| \| \| \|	Fixed failing tests
\| *	Edited timeago text on comments	Phil Hughes	2016-03-10	6	-24/+35
\| \| \| \| \| \| \| \| \| \| \| \|	Unified the 'edited text' to be the same in descriptions and comments Closes #5538
* \|	Merge branch 'blue-links-fix' into 'master'	Jacob Schatz	2016-03-17	1	-4/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert color for links inside gray areas Before ![Screen_Shot_2016-03-17_at_12.23.17_PM](/uploads/55e518721d83c3bfc42edba3e97ec44d/Screen_Shot_2016-03-17_at_12.23.17_PM.png) After ![Screen_Shot_2016-03-17_at_12.23.03_PM](/uploads/08fbf8e9139e4eadf191102cffd29617/Screen_Shot_2016-03-17_at_12.23.03_PM.png) Reverts !3147 See merge request !3276
\| * \|	Revert link color from blueblue-links-fix	Alfredo Sumaran	2016-03-17	1	-4/+0
\| \| \|
* \| \|	Merge branch 'hide-builds-feature' into 'master'	Robert Speicher	2016-03-17	4	-63/+76
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide builds from Project's settings when the feature is disabled Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/13944 See merge request !3220
\| * \| \|	Hide builds from Project's settings when the feature is disabledhide-builds-feature	Kamil Trzcinski	2016-03-15	4	-63/+76
\| \| \| \|
* \| \| \|	Merge branch 'caching-project-avatars' into 'master'	Robert Speicher	2016-03-17	5	-13/+120
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache project avatars stored in Git Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/14363 See merge request !3272
\| * \| \| \|	Cache project avatars stored in Git	Yorick Peterse	2016-03-17	5	-13/+120
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The avatar logic has been moved from Project to Repository as this makes caching easier. The logic itself in turn has been changed so that the logo file names are cached in Redis. This cache is flushed upon pushing a commit but _only_ if: 1. The commit was pushed to the default branch 2. The commit actually changes any of the logo files If no branch or commit is given the cache is flushed anyway, this ensures that calling Repository#expire_cache without any arguments still flushes the avatar cache (e.g. this is used when removing a project). Fixes gitlab-org/gitlab-ce#14363
* \| \| \|	Merge branch 'artem-forks/gitlab-ce-nginx-rel-url'	Jacob Vosmaer	2016-03-17	10	-58/+227
\|\ \ \ \
\| * \| \| \|	Lets have CSS and logo inline	Artem Sidorenko	2016-03-11	8	-56/+208
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This would work independenty from location and configuration https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/662#note_3973448
\| * \| \| \|	Do not serve anything via nginx as we have workhorse	Artem Sidorenko	2016-03-11	2	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise this might 'hide' problems https://github.com/gitlabhq/gitlabhq/issues/10053#issuecomment-188919319
* \| \| \| \|	Merge branch 'dropdown-preselect-value' into 'master'	Robert Speicher	2016-03-17	2	-4/+21
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pre-selects values on issue and merge request dropdown Closes #14290 See merge request !3233
\| * \| \| \|	Moved code to single line if	Phil Hughes	2016-03-17	1	-4/+2
\| \| \| \| \|
\| * \| \| \|	Removed label/milestone helper methodsdropdown-preselect-value	Phil Hughes	2016-03-16	2	-20/+10
\| \| \| \| \|
\| * \| \| \|	Fixed failing tests	Phil Hughes	2016-03-16	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Pre-selects values on issue and merge request dropdown	Phil Hughes	2016-03-16	2	-4/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #14290
* \| \| \| \|	Merge branch 'glalonde-triggerbuild' into 'master'	Kamil Trzciński	2016-03-17	3	-1/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjusted behavior so canceled builds tagged as allowed to fail do not fail build ## What does this MR do? This diff changes the 'Allowed to fail' flag to also ignore canceled builds, whereas before, canceled builds could fail the suite even if they were marked as 'Allowed to fail' dupe of !3258 to force a build ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? Unexpected behavior as a user ## What are the relevant issue numbers? ## Screenshots (if relevant) ![whatisgoingon](/uploads/fcd7c8f3d8454bc730d7fd41eff59b31/whatisgoingon.png) See merge request !3271
\| * \| \| \| \|	added changelog entry	Geoffrey Lalonde	2016-03-17	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	adjusted behavior so canceled builds tagged as allowed to fail do not fail build	Geoffrey Lalonde	2016-03-17	2	-1/+24
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rm_duplicate_cache_ci_docs' into 'master'	Achilleas Pipinellis	2016-03-17	1	-62/+48
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge duplicate cache entry in CI docs See merge request !3208
\| * \ \ \ \ \	Merge branch 'master' into rm_duplicate_cache_ci_docs	Achilleas Pipinellis	2016-03-17	212	-4709/+2860
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Merge duplicate cache entry in CI docsrm_duplicate_cache_ci_docs	Achilleas Pipinellis	2016-03-14	1	-60/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'patch/refactor-post-receive' into 'master'	Douwe Maan	2016-03-17	2	-27/+79
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PostReceive refactor Back-ported PostReceive refactor made for https://gitlab.com/gitlab-org/gitlab-ee/issues/367 in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/267 See merge request !3264
\| * \| \| \| \| \| \| \|	Back-porting PostReceive refactor made for EE 🍺	Gabriel Mazetto	2016-03-17	2	-27/+79
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '4009-external-users' into 'master'	Douwe Maan	2016-03-17	23	-80/+265
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	External Users The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects. Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users) ![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png) See merge request !3171
\| * \| \| \| \| \| \| \| \|	Add missing API docs on external user	Achilleas Pipinellis	2016-03-17	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	API support for setting External flag on existing users	Zeger-Jan van de Weg	2016-03-17	2	-1/+9
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Refactor external users docs	Achilleas Pipinellis	2016-03-17	1	-14/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into 4009-external-users4009-external-users	Zeger-Jan van de Weg	2016-03-15	134	-4265/+2169
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Doc external users feature	Zeger-Jan van de Weg	2016-03-15	4	-2/+21
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Improve external users feature	Zeger-Jan van de Weg	2016-03-14	4	-6/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 4009-external-users	Zeger-Jan van de Weg	2016-03-14	68	-91/+964
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Create an external users tab on Admin user list	Zeger-Jan van de Weg	2016-03-13	8	-8/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also incorporates the review into this, mainly spec changes.
\| * \| \| \| \| \| \| \| \| \|	Remove Project#publicish	Zeger-Jan van de Weg	2016-03-13	2	-8/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	External Users	Zeger-Jan van de Weg	2016-03-13	15	-60/+171
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'new-branch-button-issue' into 'master'	Douwe Maan	2016-03-17	15	-43/+238
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New branch button on issues Creates a button which creates a branch for you, referencing the original issue in the branch name. When creating the MR the text `Closes #iid` is appended to the description field. The button; with styling ![Screenshot_from_2016-02-13_17-28-54](/uploads/9595fbfef88c10a499829beaa3db11c1/Screenshot_from_2016-02-13_17-28-54.png) Links to the related branches on the issue ![Screenshot_from_2016-02-13_17-31-48](/uploads/ee7a78754eb5e2389f8671771bb59af9/Screenshot_from_2016-02-13_17-31-48.png) Styled like the MR links ![Screenshot_from_2016-02-13_17-31-53](/uploads/c60130333a650a16f51b014aeb1458c3/Screenshot_from_2016-02-13_17-31-53.png) Please provide input on the following; the CI repo on the GDK had the following happening with the current way I implemented the matching: ![Screenshot_from_2016-02-14_08-57-19](/uploads/35e7a3687a0fa801aba1ad66305ab2ff/Screenshot_from_2016-02-14_08-57-19.png) Closes #3886 cc @DouweM See merge request !2808
\| * \| \| \| \| \| \| \| \| \| \|	Fix specs	Zeger-Jan van de Weg	2016-03-17	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Spinach was right, I was a fool..
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into new-branch-button-issue	Zeger-Jan van de Weg	2016-03-17	89	-448/+697
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Incorporate the review and update spec	Zeger-Jan van de Weg	2016-03-15	5	-21/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The feature spec now also tests the absence of the new branch button
\| * \| \| \| \| \| \| \| \| \| \|	Incorporate review	Zeger-Jan van de Weg	2016-03-15	10	-27/+93
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Link in the note when started a new branch from an issue	Zeger-Jan van de Weg	2016-03-15	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Enhance new branch button on an issue	Zeger-Jan van de Weg	2016-03-15	8	-50/+99
\| \| \| \| \| \| \| \| \| \| \| \|