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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
* \| \| \| \| \| \| \|	Merge branch 'fix/gb/fix-registry-for-uppercased-project-paths' into 'master'	Kamil Trzciński	2017-04-13	4	-8/+35
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix registry for projects with uppercases in path Closes #30880 See merge request !10674
\| * \| \| \| \| \| \|	Sanitize container repository path in model classfix/gb/fix-registry-for-uppercased-project-paths	Grzegorz Bizon	2017-04-13	3	-5/+16
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix registry for projects with uppercases in path	Grzegorz Bizon	2017-04-13	2	-4/+20
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '30622-resolve-note-loading-icon-gone' into 'master'	Filipa Lacerda	2017-04-13	3	-4/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Resolve note loading icon gone" Closes #30622 See merge request !10628
\| * \| \| \| \| \| \| \|	Review changes30622-resolve-note-loading-icon-gone	Luke "Jared" Bennett	2017-04-12	1	-0/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix resolve spinner and add test	Luke "Jared" Bennett	2017-04-11	3	-4/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '30188-handle-remove-branch-failure' into 'master'	Filipa Lacerda	2017-04-13	3	-5/+58
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix js error in MR remove branch failure handler Closes #30188 See merge request !10304
\| * \| \| \| \| \| \| \|	tests for success and failure of deleting branch from MR page30188-handle-remove-branch-failure	Simon Knox	2017-04-13	3	-1/+54
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix js error in MR remove branch failure handler	Simon Knox	2017-04-12	1	-4/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'remove-iife-cycle-analytics-bundle' into 'master' 26510-should-project-updated-time-actually-be-the-last-activity-time	Filipa Lacerda	2017-04-13	12	-697/+682
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove IIFEs from files in cycle_analytics_bundle.js See merge request !10613
\| * \| \| \| \| \| \| \| \|	Remove IIFEs from files in cycle_analytics_bundle.jsremove-iife-cycle-analytics-bundle	Alfredo Sumaran	2017-04-10	12	-697/+682
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'remove-iife-boards-bundle' into 'master'	Filipa Lacerda	2017-04-13	18	-1269/+1232
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove IIFEs in boards_bundle.js See merge request !10612
\| * \| \| \| \| \| \| \| \|	Remove IIFEs in boards_bundle.jsremove-iife-boards-bundle	Alfredo Sumaran	2017-04-10	18	-1269/+1232
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '30779-show-mr-subnav-issue-tracker' into 'master'	Alfredo Sumaran	2017-04-13	12	-9/+41
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show sub-nav under Merge Requests when issue tracker is non-default Closes #30779 See merge request !10658
\| * \| \| \| \| \| \| \| \|	Show sub-nav under Merge Requests when issue tracker is non-default	Kushal Pandya	2017-04-13	12	-9/+41
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Revert "Fix registry for projects with uppercases in path"	Grzegorz Bizon	2017-04-13	2	-20/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 22726942fe0b6c11c20de070cc9784de12ca2ce6.
* \| \| \| \| \| \| \| \|	Fix registry for projects with uppercases in path	Grzegorz Bizon	2017-04-13	2	-4/+20
\| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '30642-fix-recent-search-history-icon-alignment-in-safari' into ↵	Clement Ho	2017-04-13	1	-14/+12
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix recent searches icon alignment in Safari Closes #30642 See merge request !10606
\| * \| \| \| \| \| \| \|	Fix recent searches icon alignment in Safari30642-fix-recent-search-history-icon-alignment-in-safari	Eric Eastwood	2017-04-12	1	-14/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30642
* \| \| \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2017-04-12	2	-7/+11
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'omnibus-gitlab-1993-check-shell-repositories-path-group-is-root' into 'master' Fix the `gitlab:gitlab_shell:check` task Closes omnibus-gitlab#1993 See merge request !10645
\| * \| \| \| \| \| \| \| \|	Fix the `gitlab:gitlab_shell:check` taskomnibus-gitlab-1993-check-shell-repositories-path-group-is-root	Rémy Coutable	2017-04-12	2	-7/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the `gitlab:gitlab_shell:check` task check that the repositories storage path are owned by the `root` group Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-fix-already-defined-constant' into 'master'	Douwe Maan	2017-04-12	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error See merge request !10664
\| * \| \| \| \| \| \| \| \| \|	Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition errorrs-fix-already-defined-constant	Robert Speicher	2017-04-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|