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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove format from end of URL for URLs that take a ref or pathdm-no-format-suffix	Douwe Maan	2017-04-17	2	-107/+108
\|
*	Merge branch 'fix-follow-with-multiple-paths' into 'master'	Douwe Maan	2017-04-17	2	-1/+22
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix following with multiple paths Closes gitlab-ee#2175 See merge request !10737
\| *	Fix following with multiple pathsfix-follow-with-multiple-paths	Sean McGivern	2017-04-17	2	-1/+22
\| \| \| \| \| \| \| \| \| \|	`git log --follow` is only supported for a single path. CE doesn't currently pass multiple paths, but EE does.
* \|	Merge branch 'dz-remove-repo-version' into 'master'	Douwe Maan	2017-04-17	4	-14/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `Repository#version` method and tests Closes #24251 See merge request !10734
\| * \|	Removes `Repository#version` method and testsdz-remove-repo-version	Dmitriy Zaporozhets	2017-04-17	4	-14/+5
\| \|/ \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'fix/project-visibility-setting' into 'master'	Douwe Maan	2017-04-17	3	-5/+41
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix restricted visibility project setting Closes #30581 See merge request !10622
\| * \|	Fix restricted visibility project setting	James Lopez	2017-04-17	3	-5/+41
\|/ /
* \|	Merge branch '30986-diff-text-overflowing' into 'master'	Annabel Dunstone Gray	2017-04-17	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added break-word wrap Closes #30986 See merge request !10733
\| * \|	Added break-word wrap30986-diff-text-overflowing	Luke "Jared" Bennett	2017-04-17	1	-0/+4
\| \|/
* \|	Merge branch 'sh-add-option-to-hard-delete' into 'master'	Douwe Maan	2017-04-17	4	-3/+10
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hard delete users' associated records deleted from AbuseReports Closes #31021 See merge request !10723
\| * \|	Hard delete users' associated records deleted from AbuseReportssh-add-option-to-hard-delete	Stan Hu	2017-04-16	4	-3/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the case of spammers, we really want a hard delete to avoid retaining spam. Closes #31021
* \| \|	Merge branch 'fix-trace-encoding' into 'master'	Sean McGivern	2017-04-17	3	-4/+31
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Explicitly give Encoding.default_external for trace Closes #30796 See merge request !10728
\| * \|	Set the encoding in c'tor and explain why it's finefix-trace-encoding	Lin Jen-Shin	2017-04-17	2	-9/+9
\| \| \|
\| * \|	Add changelog entry	Lin Jen-Shin	2017-04-17	1	-0/+4
\| \| \|
\| * \|	Restore nil for stream	Lin Jen-Shin	2017-04-17	1	-1/+1
\| \| \|
\| * \|	Only set the encoding before passing to Ansi2html	Lin Jen-Shin	2017-04-17	3	-12/+15
\| \| \|
\| * \|	Don't try to read if there's no trace	Lin Jen-Shin	2017-04-17	1	-0/+2
\| \| \|
\| * \|	Make sure @stream.each_line would tag Encoding.default_external	Lin Jen-Shin	2017-04-17	2	-4/+16
\| \| \|
\| * \|	Make sure we're giving Encoding.default_external	Lin Jen-Shin	2017-04-17	2	-5/+11
\|/ /
* \|	Merge branch '27655-clear-emoji-search-after-selection' into 'master'	Alfredo Sumaran	2017-04-17	4	-24/+67
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clear emoji search in awards menu after picking emoji Closes #27655 See merge request !10524
\| * \|	Clear emoji search in awards menu after picking emoji27655-clear-emoji-search-after-selection	Eric Eastwood	2017-04-13	4	-24/+67
\| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27655
* \| \|	Merge branch 'sh-fix-base-parser' into 'master'	Robert Speicher	2017-04-16	2	-3/+23
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix regression in rendering Markdown references that do not exist Closes #30972 See merge request !10716
\| * \| \|	Fix regression in rendering Markdown references that do not existsh-fix-base-parser	Stan Hu	2017-04-15	2	-3/+23
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Closes #30972
* \| \|	Merge branch ↵	Phil Hughes	2017-04-15	1	-4/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'30492-using-icon-to-mark-discussion-as-resolved-does-not-resolve-discussion' into 'master' Resolve "Using icon to mark discussion as resolved does not resolve discussion" Closes #30492 See merge request !10652
\| * \| \|	Update ResolveBtn when CommentStore changes state30492-using-icon-to-mark-discussion-as-resolved-does-not-resolve-discussion	Sam Rose	2017-04-13	1	-4/+4
\| \| \| \|
* \| \| \|	Merge branch 'issue-title-vue-sfc' into 'master'	Phil Hughes	2017-04-15	5	-25/+24
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Issue Title Vue: convert to .vue - use 'render' with 'createElement' in index See merge request !10625
\| * \| \|	Issue Title Vue: convert to .vue - use 'render' with 'createElement' in index	Regis Boudinot	2017-04-15	5	-25/+24
\|/ / /
* \| \|	Merge branch 'sh-disable-cache-classes' into 'master'	Robert Speicher	2017-04-14	2	-1/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Turn on caching of classes in Knapsack specs See merge request !10709
\| * \| \|	Turn on caching of classes in Knapsack specs	Stan Hu	2017-04-14	2	-1/+8
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enabling caching of classes slows start-up time because all controllers are loaded at initialization, but it reduces memory and load because files are not reloaded with every request. For example, caching is not necessary for loading database migrations but useful for handling Knapsack specs. Addresses gitlab-org/gitlab-ee#2162
* \| \|	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.