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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Split project and group milestone dispatcher branch39020-fix-js-call-stack-size-exceeded-autocomplete-group-milestone	Luke "Jared" Bennett	2017-10-24	1	-0/+4
\|
*	Prefer dispatcher glform init over global init	Luke "Jared" Bennett	2017-10-23	1	-0/+1
\|
*	Added group milestones form spec	Luke "Jared" Bennett	2017-10-20	1	-3/+10
\|
*	Remove page-specific GLForm init and add support_autocomplete: false local ↵	Luke "Jared" Bennett	2017-10-20	2	-2/+1
\| \| \| \|	to groups/milestones/_form
*	Merge branch 'fix-non-diff-resolved-discussion' into 'master'	Phil Hughes	2017-10-20	3	-7/+29
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Force non diff resolved discussion to display when collapse toggled Closes #39187 See merge request gitlab-org/gitlab-ce!14946
\| *	Force non diff resolved discussion to display when collapse toggled	Clement Ho	2017-10-20	3	-7/+29
\|/
*	Merge branch '37391-wiki-disk-path-helper' into 'master'	Nick Thomas	2017-10-20	4	-4/+4
\|\ \| \| \| \| \| \| \| \|	Use wiki.disk_path See merge request gitlab-org/gitlab-ce!14930
\| *	Use wiki.disk_path	Nick Thomas	2017-10-18	4	-4/+4
\| \|
* \|	Merge branch 'patch-24' into 'master'	Rémy Coutable	2017-10-20	1	-0/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	add note about after_script being run separately See merge request gitlab-org/gitlab-ce!13689
\| * \|	add note about after_script being run separately	Martin Nowak	2017-10-20	1	-0/+6
\|/ /
* \|	Merge branch 'animate-auto-devops' into 'master'	Annabel Dunstone Gray	2017-10-20	3	-2/+18
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Animate auto devops graphic Closes #39242 See merge request gitlab-org/gitlab-ce!14931
\| * \|	Animate auto devops graphicanimate-auto-devops	Clement Ho	2017-10-18	3	-2/+18
\| \| \|
* \| \|	Merge branch 'update-nav-sidebar-hover' into 'master'	Annabel Dunstone Gray	2017-10-19	1	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update nav sidebar hover color to increase contrast Closes #37660 See merge request gitlab-org/gitlab-ce!14829
\| * \| \|	update nav sidebar hover color to increase contrastupdate-nav-sidebar-hover	tauriedavis	2017-10-11	1	-3/+3
\| \| \| \|
* \| \| \|	Merge branch 'docs/Wernight/gitlab-ce-patch-28' into 'master'	Achilleas Pipinellis	2017-10-19	1	-19/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates google.md to match current version. See merge request gitlab-org/gitlab-ce!14912
\| * \| \| \|	Updates google.md to match current version.docs/Wernight/gitlab-ce-patch-28	Werner Beroux	2017-10-17	1	-19/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-document-plus-encoding-api' into 'master'	Achilleas Pipinellis	2017-10-19	1	-0/+17
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document converting `+` to `%2B` in an API query parameter See merge request gitlab-org/gitlab-ce!14948
\| * \| \| \| \|	Document converting `+` to `%2B` in an API query parametersh-document-plus-encoding-api	Stan Hu	2017-10-18	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \|	Merge branch 'sh-api-json-logs' into 'master'	Achilleas Pipinellis	2017-10-19	1	-2/+22
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for `api_json.log` file See merge request gitlab-org/gitlab-ce!14950
\| * \| \| \| \| \|	Add docs for `api_json.log` filesh-api-json-logs	Stan Hu	2017-10-18	1	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch 'bvl-port-of-ee-translations' into 'master'	Douwe Maan	2017-10-19	15	-1147/+8176
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE port of EE translations See merge request gitlab-org/gitlab-ce!14954
\| * \| \| \| \| \| \|	Merge branch 'master-i18n' into 'master'	Douwe Maan	2017-10-19	15	-1147/+8176
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New Crowdin translations See merge request gitlab-org/gitlab-ee!3030
* \| \| \| \| \| \|	Merge branch 'pawel/upgrade_prometheus_gem_to_fix_problem_with_file_locking' ↵	Stan Hu	2017-10-19	2	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Update Prometheus gem to fix problems with other Processes overwriting current metrics file Closes #36714 See merge request gitlab-org/gitlab-ce!14827
\| * \| \| \| \| \| \|	Update Prometheus gem to fix problems with other files overwriting current file	Pawel Chojnacki	2017-10-19	2	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'rc/balance-test-job-nodes' into 'master'	Robert Speicher	2017-10-19	1	-63/+63
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce Spinach parallelization to 4 nodes and increase RSpec's to 26 nodes See merge request gitlab-org/gitlab-ce!14936
\| * \| \| \| \| \| \| \|	Reduce Spinach parallelization to 4 nodes and increase RSpec's to 26 nodesrc/balance-test-job-nodes	Rémy Coutable	2017-10-18	1	-63/+63
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'rc/reduce-duplication-in-tests-metadata-state-job-definition' ↵	Robert Speicher	2017-10-19	1	-9/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Improve the .tests-metadata-state definition a bit See merge request gitlab-org/gitlab-ce!14937
\| * \| \| \| \| \| \| \|	Improve the .tests-metadata-state definition a bitrc/reduce-duplication-in-tests-metadata-state-job-definition	Rémy Coutable	2017-10-18	1	-9/+4
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch '18765-stub_env_in_specs' into 'master'	Robert Speicher	2017-10-19	9	-202/+246
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add a 'custom cop' to RuboCop that bans ENV assignment" Closes #18765 See merge request gitlab-org/gitlab-ce!14810
\| * \| \| \| \| \| \| \|	Add a new RSpec::EnvAssignment cop to prevent assigning to ENV in specs18765-stub_env_in_specs	Rémy Coutable	2017-10-18	4	-5/+135
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Stub ENV in the LDAP task spec file	Rémy Coutable	2017-10-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Stub ENV in the Gitaly task spec file	Rémy Coutable	2017-10-18	1	-8/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Stub ENV in the backup task spec file	Rémy Coutable	2017-10-18	3	-188/+109
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'not-found-in-commits' into 'master'	Douwe Maan	2017-10-19	4	-3/+37
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renders 404 in commits controller if no commits are found Closes #37620 See merge request gitlab-org/gitlab-ce!14610
\| * \| \| \| \| \| \| \|	Renders 404 in commits controller if no commits are found	Guilherme Vieira	2017-10-18	4	-3/+37
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '34754-graphql-policy-update' into 'master'	Douwe Maan	2017-10-19	2	-1/+17
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GraphQL licensing situation in the docs See merge request gitlab-org/gitlab-ce!14940
\| * \| \| \| \| \| \| \| \|	Update GraphQL licensing situation in the docs	Nick Thomas	2017-10-18	2	-1/+17
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-broken-docker-delete' into 'master'	Grzegorz Bizon	2017-10-19	4	-5/+10
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix inability to delete container registry tags Closes #39260 See merge request gitlab-org/gitlab-ce!14947
\| * \| \| \| \| \| \| \| \|	Fix broken function invocationsh-fix-broken-docker-delete	Filipa Lacerda	2017-10-19	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix inability to delete container registry tags	Stan Hu	2017-10-18	2	-3/+8
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because container registry tags can have periods, the addition of the `.json` format caused ambiguity. Since the tag name regex is greedy, it would attempt to locate an image named `foo.json` instead of `foo`. Closes #39260
* \| \| \| \| \| \| \| \|	Merge branch 'encoding-helper-performance' into 'master'	Rémy Coutable	2017-10-19	2	-4/+19
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoind unnecesary `force_encoding` operations Closes #39227 See merge request gitlab-org/gitlab-ce!12167
\| * \| \| \| \| \| \| \| \|	Avoind unnecesary `force_encoding` operations	Alejandro Rodríguez	2017-10-18	2	-4/+19
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They're costly. This will also avoid some edge cases where charlock_holmes assigns a weird encoding to a perfectly valid UTF-8 string.
* \| \| \| \| \| \| \| \|	Merge branch '38648-members-sidebar' into 'master'	Phil Hughes	2017-10-19	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add members flyout on collapsed sidebar Closes #38648 See merge request gitlab-org/gitlab-ce!14942
\| * \| \| \| \| \| \| \| \|	Add members flyout on collapsed sidebar38648-members-sidebar	Annabel Dunstone Gray	2017-10-18	1	-0/+5
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '38869-dropzone-input' into 'master'	Phil Hughes	2017-10-19	7	-309/+269
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove dropzoneInput from global namespace Closes #20930 See merge request gitlab-org/gitlab-ce!14894
\| * \| \| \| \| \| \| \|	Remove dropzoneInput from global namespace	Filipa Lacerda	2017-10-19	7	-309/+269
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '36160-zindex' into 'master'	Annabel Dunstone Gray	2017-10-18	2	-0/+10
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decreases z-index of select2 to a lower number of our navigation bar Closes #36160 See merge request gitlab-org/gitlab-ce!14925
\| * \| \| \| \| \| \|	Decreases z-index of select2 to a lower number of our navigation bar36160-zindex	Filipa Lacerda	2017-10-18	2	-0/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '39253-jobs-fail-because-of-brazilian-portuguese-translations' ↵	Rémy Coutable	2017-10-18	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Jobs fail because of Brazilian Portuguese translations" Closes #39253 See merge request gitlab-org/gitlab-ce!14939
\| * \| \| \| \| \| \| \|	Prevent ApplicationHelper specs from polluting later ones39253-jobs-fail-because-of-brazilian-portuguese-translations	Sean McGivern	2017-10-18	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't want the locale to be set to Brazilian Portuguese for any subsequent specs!