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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix color merge conflict29595-customize-experience-callout	tauriedavis	2017-04-14	0	-0/+0
\|\
\| *	Fixed tests	Jose Ivan Vargas	2017-04-13	2	-3/+2
\| \|
\| *	29595 Customize experience callout design	tauriedavis	2017-04-13	3	-22/+60
\| \|
* \|	Remove lighten blue and add blue-25 for background	tauriedavis	2017-04-14	1	-1/+1
\| \|
* \|	Fixed tests	Jose Ivan Vargas	2017-04-14	2	-3/+2
\| \|
* \|	29595 Customize experience callout design	tauriedavis	2017-04-14	3	-22/+60
\| \|
* \|	Merge branch '30810-fix-note-header-info-and-action-overlap' into 'master'	Annabel Dunstone Gray	2017-04-14	2	-18/+35
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix note header timeago and action overlap Closes #30810 See merge request !10644
\| * \|	Fix note header timeago and action overlap30810-fix-note-header-info-and-action-overlap	Eric Eastwood	2017-04-13	2	-18/+35
\| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30810
* \| \|	Merge branch 'remove-double-newline-for-single-attachments' into 'master'	Phil Hughes	2017-04-14	3	-5/+13
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only add newlines for multiple uploads Closes #29782 See merge request !10545
\| * \| \|	Only add newlines for multiple uploadsremove-double-newline-for-single-attachments	Luke "Jared" Bennett	2017-04-14	3	-5/+13
\| \| \| \|
* \| \| \|	Merge branch 'add-cookie-expirations-to-callouts' into 'master'	Phil Hughes	2017-04-14	2	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add expirations to CA and user callouts Closes #30267 See merge request !10568
\| * \| \| \|	Add expirations to CA and user callouts	Luke "Jared" Bennett	2017-04-14	2	-2/+2
\| \|/ / /
* \| \| \|	Merge branch 'frontend_prevent_authored_awardable_votes' into 'master'	Alfredo Sumaran	2017-04-14	8	-12/+100
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	frontend prevent authored votes Closes #21881 See merge request !6260
\| * \| \|	frontend prevent authored votes	barthc	2017-04-14	8	-12/+100
\| \| \| \|
* \| \| \|	Merge branch 'use-hashie-forbidden_attributes' into 'master'	Rémy Coutable	2017-04-14	3	-1/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the hashie-forbideen_attributes gem Closes #26400 See merge request !10579
\| * \| \| \|	Use the hashie-forbideen_attributes gem	andrew brown	2017-04-09	3	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This gem prevents Mash from responding to :permitted?, disabling mass assignment protection for the Grape API
* \| \| \| \|	Merge branch 'revert-a0d734c9' into 'master'	Stan Hu	2017-04-14	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'grpc-1.2.2' into 'master'" See merge request !10700
\| * \| \| \| \|	Revert "Merge branch 'grpc-1.2.2' into 'master'"revert-a0d734c9	Lin Jen-Shin (godfat)	2017-04-14	1	-1/+1
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \|	This reverts merge request !10589
* \| \| \| \|	Merge branch 'patch-17' into 'master'	Rémy Coutable	2017-04-14	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update show.html.haml to allow guests to see the Files tab as per #30199 See merge request !10640
\| * \| \| \| \|	Update show.html.haml to allow guests to see the Files tab as per ↵	AJ ONeal	2017-04-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/30199
* \| \| \| \| \|	Merge branch '30349-create-users-build-service' into 'master'	Rémy Coutable	2017-04-14	7	-160/+176
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement Users::BuildService Closes #30349 See merge request !10675
\| * \| \| \| \| \|	Refactor build_service_spec	George Andrinopoulos	2017-04-13	1	-4/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Implement Users::BuildService	geoandri	2017-04-13	7	-160/+178
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'patch-14' into 'master'	Rémy Coutable	2017-04-14	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #28531 - Enable the import_url field. Closes #28531 See merge request !9438
\| * \| \| \| \| \| \|	Enable the import_url field.	Rune Philosof	2017-02-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #28531 The field should be enabled on `project/import/new`. It shouldn't hurt to have the field enabled on `projects/new` as well.
* \| \| \| \| \| \| \|	Merge branch 'branch-versions' into 'master'	Rémy Coutable	2017-04-14	7	-86/+67
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expand components version specification format to allow branches Closes gitaly#183 See merge request !10610
\| * \| \| \| \| \| \|	Expand components version specification format to allow branchesbranch-versions	Alejandro Rodríguez	2017-04-13	7	-86/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently we specify versions for Gitlab-Shell, Workhorse and Gitaly using version strings, to which we prepend 'v' and assume are tags. These changes allow branches or tags with other name formats to be specified by prepending '=' to the version string (á la govendor). We also simplify the process to reset to the given version (now a branch or tag): Right now there's a check to supposedly try to avoid fetching from the remote the version if it already exist locally. But the previous logic already clones if the directory doesn't exist or fetches if it does, so this check is pointless. We can safely assume the version exists once we get to the reset stage.
* \| \| \| \| \| \| \|	Merge branch 'sh-improve-logging-for-bad-creations' into 'master'	Robert Speicher	2017-04-14	2	-0/+17
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve error messages when a record is unable to be created for a project See merge request !10696
\| * \| \| \| \| \| \| \|	Improve error messages when a record is unable to be created for a project	Stan Hu	2017-04-13	2	-0/+17
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '30907-allow-to-enable-rspec-profile-for-a-given-branch' into ↵	Robert Speicher	2017-04-13	1	-2/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Allow to enable `rspec_profiling` for a branch on the CI Closes #30907 See merge request !10680
\| * \| \| \| \| \| \| \| \|	Allow to enable `rspec_profiling` for a branch on the CI30907-allow-to-enable-rspec-profile-for-a-given-branch	Rémy Coutable	2017-04-13	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`rspec_profiling` will be enabled if the branch name includes `rspec-profile`. Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'issues-empty-state-not-centered' into 'master'	Annabel Dunstone Gray	2017-04-13	2	-2/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Centered empty state for issues Closes #30872 See merge request !10689
\| * \| \| \| \| \| \| \| \| \|	Centered empty state for issues	Jose Ivan Vargas	2017-04-13	2	-2/+8
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'pms-lighter-colors' into 'master'	Annabel Dunstone Gray	2017-04-13	2	-13/+21
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add lighter colors and fix existing light colors See merge request !10690
\| * \| \| \| \| \| \| \| \| \|	Add lighter color variables. Fix active note color.pms-lighter-colors	Pedro Moreira da Silva	2017-04-13	2	-13/+21
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'clear-instructions' into 'master'	Yorick Peterse	2017-04-13	1	-8/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make instructions clearer See merge request !10685
\| * \| \| \| \| \| \| \| \| \|	Make instructions clearerclear-instructions	Sid Sijbrandij	2017-04-13	1	-8/+5
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-add-icon-for-active-service-template' into 'master'	Robert Speicher	2017-04-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use an icon to indicate whether service template is active See merge request !10694
\| * \| \| \| \| \| \| \| \| \|	Use an icon to indicate whether service template is active	Stan Hu	2017-04-13	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-appending-state-to-issuable-references' into 'master'	Robert Speicher	2017-04-13	2	-13/+34
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix appending state to issuable references Closes #30874 See merge request !10683
\| * \| \| \| \| \| \| \| \| \|	Fix appending state to issuable referencesfix-appending-state-to-issuable-references	Adam Niedzielski	2017-04-13	2	-13/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #30874. Ignore nodes with no children. Append directly to the node instead of the last child of the node to avoid inheriting formatting from the last child
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-trace-seeking-readline' into 'master'	Kamil Trzciński	2017-04-13	5	-10/+41
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After Trace#limit, we seek to the next line in case Closes #30796 See merge request !10681
\| * \| \| \| \| \| \| \| \| \| \|	Update tests for the fact that we would skip one linefix-trace-seeking-readline	Lin Jen-Shin	2017-04-13	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Don't seek at all if the log is small anyway	Lin Jen-Shin	2017-04-13	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	then it's fine to skip the first line because it won't be very noticeable
\| * \| \| \| \| \| \| \| \| \| \|	Add changelog entry	Lin Jen-Shin	2017-04-13	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	After Trace#limit, we seek to the next line in case	Lin Jen-Shin	2017-04-13	4	-3/+32
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	of breaking ANSI sequence or Unicode
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'empty-task-list-alignment' into 'master' jej/master-green jej-master-green	Annabel Dunstone Gray	2017-04-13	2	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed alignment of empty task list items Closes #29913 See merge request !10480
\| * \| \| \| \| \| \| \| \| \| \|	Fixed alignment of empty task list itemsempty-task-list-alignment	Phil Hughes	2017-04-11	2	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #29913
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'notebook-katex-rendering-improvements' into 'master'	Jacob Schatz	2017-04-13	1	-15/+44
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly parse katex math in IPyhton notebooks Closes #30900 See merge request !10678
\| * \| \| \| \| \| \| \| \| \| \|	Correctly parse katex math in IPyhton notebooksnotebook-katex-rendering-improvements	Phil Hughes	2017-04-13	1	-15/+44
\| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously only some of the math was getting parsed. This makes it so that different math options are possible & correctly parsed Also fixes an issue that meant HTML was being outputted that could cause an XSS Closes #30900