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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert "Merge branch '36160-select2-dropdown' into 'master'"revert-8ae7963c	Filipa Lacerda	2017-10-12	2	-6/+0
\| \| \|	This reverts merge request !14768
*	Merge branch 'fix/rugged-alternate-paths' into 'master'	Douwe Maan	2017-10-12	2	-2/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix the format of rugged alternate directory list Closes #39046 See merge request gitlab-org/gitlab-ce!14840
\| *	Fix the format of rugged alternate directory listfix/rugged-alternate-paths	Ahmad Sherif	2017-10-12	2	-2/+3
\| \| \| \| \| \| \| \|	Fixes #39046
* \|	Merge branch '34897-delete-branch-after-merge' into 'master'	Sean McGivern	2017-10-12	4	-14/+38
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "remove source branch" checkbox from merge widget being ignored Closes #34897 See merge request gitlab-org/gitlab-ce!14832
\| * \|	fix a whitespace34897-delete-branch-after-merge	Micael Bergeron	2017-10-12	1	-1/+1
\| \| \|
\| * \|	fix for discussion	Micael Bergeron	2017-10-12	1	-3/+4
\| \| \|
\| * \|	[ci-skip] add changelog	micael.bergeron	2017-10-11	1	-0/+5
\| \| \|
\| * \|	fix the merger override to remove source branch	micael.bergeron	2017-10-11	1	-5/+8
\| \| \|
\| * \|	add spec	micael.bergeron	2017-10-11	2	-7/+22
\| \| \|
* \| \|	Merge branch 'update-installation-doc-for-10-1' into 'master'	Rémy Coutable	2017-10-12	2	-6/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update installation doc for 10.1 See merge request gitlab-org/gitlab-ce!14843
\| * \| \|	Update doc accordingly to:update-installation-doc-for-10-1	Lin Jen-Shin	2017-10-12	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#creating-rc1
* \| \| \|	Merge branch 'gitaly-fetch-remote' into 'master'	Dmitriy Zaporozhets	2017-10-12	2	-0/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `Gitlab::Git::Repository#fetch` command Closes gitaly#586 See merge request gitlab-org/gitlab-ce!14772
\| * \| \| \|	Add `Gitlab::Git::Repository#fetch` commandgitaly-fetch-remote	Alejandro Rodríguez	2017-10-09	2	-0/+21
\| \| \| \| \|
* \| \| \| \|	Merge branch '37691-subscription-fires-multiple-notifications' into 'master'	Sean McGivern	2017-10-12	4	-8/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix multiple notifications from being sent for multiple labels Closes #37691 See merge request gitlab-org/gitlab-ce!14798
\| * \| \| \| \|	fix a wrong method call in the refactor	micael.bergeron	2017-10-12	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	[ci-skip] add changelog37691-subscription-fires-multiple-notifications	micael.bergeron	2017-10-10	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	fix multiple notifications from being sent for multiple labels	micael.bergeron	2017-10-10	3	-8/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also refactor the email_helper support spec to watch for multiple emails being sent.
* \| \| \| \| \|	Merge branch 'update-templates' into 'master'	Rémy Coutable	2017-10-12	19	-21/+85
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update templates See merge request gitlab-org/gitlab-ce!14844
\| * \| \| \| \| \|	Update templates via:	Lin Jen-Shin	2017-10-12	19	-21/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bin/rake gitlab:update_templates
* \| \| \| \| \| \|	Merge branch 'cache-issuable-template-names' into 'master'	Douwe Maan	2017-10-12	7	-28/+54
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache issuable template names See merge request gitlab-org/gitlab-ce!14823
\| * \| \| \| \| \|	Cache issuable template names	Sean McGivern	2017-10-12	6	-13/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were looking these up on each request to an issue page, because the form is pre-filled, as is the template dropdown. That was unnecessary: we could just treat these as 'special' repository files (like the rendered README) and cache them in Redis until they change on a push.
\| * \| \| \| \| \|	Match full file path in FileDetector	Sean McGivern	2017-10-12	3	-15/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The basename appears to have been a holdover from the past - it doesn't look necessary now. Some of the regexes were unanchored on one side, so explicitly ensure that they only match the root. Apart from that, this means that pushing to foo/README.md will no longer invalidate the main README cache for a project.
* \| \| \| \| \| \|	Merge branch 'dm-api-authentication' into 'master'	Robert Speicher	2017-10-12	5	-105/+108
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move all API authentication code to APIGuard See merge request gitlab-org/gitlab-ce!14528
\| * \| \| \| \| \|	Move all API authentication code to APIGuard	Douwe Maan	2017-10-12	5	-105/+108
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '39001-mr-tabs-hover' into 'master'	Phil Hughes	2017-10-12	1	-0/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes from CSS refactor Closes #39001 and #38939 See merge request gitlab-org/gitlab-ce!14828
\| * \| \| \| \| \| \|	Fixes from CSS refactor	Annabel Dunstone Gray	2017-10-12	1	-0/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '35652-prometheus-service-page-shows-error' into 'master'	Phil Hughes	2017-10-12	3	-5/+18
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Prometheus service page shows error" Closes #35652 See merge request gitlab-org/gitlab-ce!14771
\| * \| \| \| \| \| \|	Resolve "Prometheus service page shows error"	Jose Ivan Vargas Lopez	2017-10-12	3	-5/+18
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'winh-shorten-inclusive-language-example-docs' into 'master'	Achilleas Pipinellis	2017-10-12	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Shorten example translation for inclusive language See merge request gitlab-org/gitlab-ce!14833
\| * \| \| \| \| \| \|	Shorten example translation for inclusive languagewinh-shorten-inclusive-language-example-docs	Winnie Hellmann	2017-10-11	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs/gke-cluster' into 'master'	Achilleas Pipinellis	2017-10-12	4	-59/+172
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for GKE integration See merge request gitlab-org/gitlab-ce!14712
\| * \| \| \| \| \| \| \|	Explicit state integration deletion	Achilleas Pipinellis	2017-10-12	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix Google API callbackdocs/gke-cluster	Achilleas Pipinellis	2017-10-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/38911#note_42966393
\| * \| \| \| \| \| \| \|	Add link to Google billing account	Achilleas Pipinellis	2017-10-09	1	-1/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Refine Google integration steps	Achilleas Pipinellis	2017-10-06	1	-8/+9
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix broken link	Achilleas Pipinellis	2017-10-06	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove Google sign-in requirement	Achilleas Pipinellis	2017-10-06	1	-6/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Simplify overview	Achilleas Pipinellis	2017-10-05	1	-2/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Refactor the Google integration page	Achilleas Pipinellis	2017-10-05	1	-59/+78
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add docs for GKE integration	Achilleas Pipinellis	2017-10-05	3	-0/+98
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs/fix-dev-doc' into 'master'	Achilleas Pipinellis	2017-10-12	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a missing link and create a separate "Testing guides" section See merge request gitlab-org/gitlab-ce!14819
\| * \| \| \| \| \| \| \| \|	Fix a missing link and create a separate "Testing guides" sectiondocs/fix-dev-doc	Rémy Coutable	2017-10-11	2	-1/+6
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch ↵	Tim Zallmann	2017-10-12	5	-7/+19
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39033-d3-js-is-being-included-in-the-user_profile-and-graphs_show-bundles' into 'master' Resolve "d3.js is being included in the user_profile and graphs_show bundles" Closes #39033 See merge request gitlab-org/gitlab-ce!14826
\| * \| \| \| \| \| \| \|	Removed d3.js from the users and graphs bundle39033-d3-js-is-being-included-in-the-user_profile-and-graphs_show-bundles	Jose Ivan Vargas	2017-10-11	5	-7/+19
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '39028-repo-by-url-fields' into 'master'	Tim Zallmann	2017-10-12	3	-50/+56
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add project fields to import project by url Closes #39028 See merge request gitlab-org/gitlab-ce!14822
\| * \| \| \| \| \| \| \|	Update template description wording39028-repo-by-url-fields	Annabel Dunstone Gray	2017-10-11	1	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add project fields to import project by url	Annabel Dunstone Gray	2017-10-11	2	-47/+53
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'issue-36484' into 'master'	Annabel Dunstone Gray	2017-10-11	3	-10/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary alt-texts from pipeline emails See merge request gitlab-org/gitlab-ce!14602
\| * \| \| \| \| \| \| \| \|	Remove unnecessary alt-texts from pipeline emails	Gustav Ernberg	2017-10-02	3	-10/+15
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '38871-cleanup-data-page-attribute-after-karma-test' into 'master'	Clement Ho	2017-10-11	12	-22/+61
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup data-page attribute after each Karma test Closes #38871 See merge request gitlab-org/gitlab-ce!14742