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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert link color from blueblue-links-fix	Alfredo Sumaran	2016-03-17	1	-4/+0
\|
*	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
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	new-branch-button	Zeger-Jan van de Weg	2016-03-15	11	-4/+81
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix_horizontal_overflow_in_code_tag' into 'master'	Jacob Schatz	2016-03-17	1	-0/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix horizontal overflow that occurs in the code tag closes #14167 ### Before Fix ![Screen_Shot_2016-03-16_at_9.10.52_PM](/uploads/b4a282ffc33684983d7e2482b8e13a8f/Screen_Shot_2016-03-16_at_9.10.52_PM.png) ### After Fix ![Screen_Shot_2016-03-16_at_9.11.16_PM](/uploads/8acca3b46bfdbd929cc096ad070022e2/Screen_Shot_2016-03-16_at_9.11.16_PM.png) See merge request !3255
\| * \| \| \| \| \| \|	Added comment to make builds run	Jacob Schatz	2016-03-17	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix horizontal overflow that occurs in the code tag	Arinde Eniola	2016-03-16	1	-0/+6
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'css-space-after-colon' into 'master'	Jacob Schatz	2016-03-17	10	-32/+32
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow the CSS Style Guide rules for including a space after the property colon. Fixes violations of SpaceAfterPropertyColon. Discussed in #14299. [ci skip] cc: @rspeicher @jschatz1 See merge request !3260
\| * \| \| \| \| \| \|	Follow the CSS Style Guide rules for including a space after the property colon.	connorshea	2016-03-16	10	-32/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes violations of SpaceAfterPropertyColon. Discussed in #14299. [ci skip]
* \| \| \| \| \| \| \|	Merge branch 'fix/reuse-existing-no-cache-method' into 'master'	Kamil Trzciński	2016-03-17	2	-13/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reuse `no_cache_headers` method in badges controller Closes #14100 See merge request !3269
\| * \| \| \| \| \| \|	Reuse `no_cache_headers` method in badges controller	Grzegorz Bizon	2016-03-17	2	-13/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Robert Schilling	2016-03-17	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in README.md See merge request !3250
\| * \| \| \| \| \| \|	Fix typo in README.md.	Mark Pundsack	2016-03-16	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix_wiki_links' into 'master'	Robert Speicher	2016-03-17	5	-4/+25
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix wiki search results point to raw source Closes https://github.com/gitlabhq/gitlabhq/issues/9581 See merge request !3138
\| * \| \| \| \| \|	Fix wiki search results point to raw source	Hiroyuki Sato	2016-03-17	5	-4/+25
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'css-zero-unit-fix' into 'master'	Jacob Schatz	2016-03-17	26	-139/+140
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow the CSS Style Guide rules for unitless zero values. Discussed in #14299. cc: @rspeicher @jschatz1 See merge request !3259
\| * \| \| \| \| \|	Follow the CSS Style Guide rules for unitless zero values.	connorshea	2016-03-16	26	-139/+140
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated Emoji Rake task to conform to style guide. Discussed in #14299. [ci skip]
* \| \| \| \| \|	Merge branch 'danielcarraro/gitlab-ce-feature/omniauth-auth0-gem' into 'master'	Robert Speicher	2016-03-16	6	-0/+101
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	omniauth-auth0 gem support See merge request !3246
\| * \| \| \| \| \|	Added omniauth-auth0 Gem + Applicable Documentation.	Daniel Carraro	2016-03-16	6	-0/+101
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'dropdown-caret-color' into 'master'	Jacob Schatz	2016-03-16	3	-3/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes issue with dropdown caret being incorrect color Previously: ![Screen_Shot_2016-03-16_at_19.31.20](/uploads/b887a7b8249f172513c68289c52a4cf7/Screen_Shot_2016-03-16_at_19.31.20.png) Now: ![Screen_Shot_2016-03-16_at_19.29.37](/uploads/9c0d6a3002c18a8c7890df8dce612dcb/Screen_Shot_2016-03-16_at_19.29.37.png) See merge request !3254
\| * \| \| \| \| \|	Fixes issue with dropdown caret being incorrect color	Phil Hughes	2016-03-16	3	-3/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'ci-runners-token-index' into 'master'	Yorick Peterse	2016-03-16	2	-4/+18
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See merge request !3249
\| * \| \| \| \| \|	Added an index on ci_runners.token	Yorick Peterse	2016-03-16	2	-4/+18
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On PostgreSQL the index is created concurrently. Fixes gitlab-org/gitlab-ce#14325
* \| \| \| \| \|	Merge branch 'css-hex-format' into 'master'	Jacob Schatz	2016-03-16	45	-242/+242
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow the CSS Style Guide rules for HEX colors. Use lowercase letters and shorthand values for HEX colors where possible, in accordance with the CSS Style Guide. Discussed in #14299. \cc @jschatz1 @rspeicher See merge request !3238
\| * \| \| \| \| \|	Follow the CSS Style Guide rules for HEX colors.	connorshea	2016-03-15	45	-242/+242
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use lowercase letters and shorthand values for HEX colors where possible. Discussed in #14299.
* \| \| \| \| \|	Merge branch 'git-version' into 'master'	Jacob Vosmaer	2016-03-16	1	-3/+4
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Install Git 2.7.3, not 2.4.3 See merge request !3248