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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update docs on creating MRsdocs/update-create-mr	Achilleas Pipinellis	2017-10-21	4	-13/+10
\|
*	Merge branch 'docs/ci-disposable-environment' into 'master'	Achilleas Pipinellis	2017-10-21	1	-0/+2
\|\ \| \| \| \| \| \| \| \|	Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` See merge request gitlab-org/gitlab-ce!14781
\| *	Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`	Alessio Caiazza	2017-10-21	1	-0/+2
\|/
*	Merge branch 'multi-file-editor-submodules' into 'master'	Filipa Lacerda	2017-10-20	8	-5/+75
\|\ \| \| \| \| \| \| \| \|	Added submodule support in multi-file editor See merge request gitlab-org/gitlab-ce!14971
\| *	Added submodule support in multi-file editor	Phil Hughes	2017-10-20	8	-5/+75
\| \|
* \|	Merge branch 'use-title' into 'master'	Filipa Lacerda	2017-10-20	4	-7/+12
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use title as placeholder instead of issue title for reusability Closes gitlab-ee#3781 See merge request gitlab-org/gitlab-ce!14927
\| * \|	Use title as placeholder instead of issue title for reusability	Clement Ho	2017-10-20	4	-7/+12
\|/ /
* \|	Merge branch 'fix-application-setting-nil-cache' into 'master'	Winnie Hellmann	2017-10-20	4	-2/+25
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent ApplicationSetting to cache nil value Closes #39275 See merge request gitlab-org/gitlab-ce!14952
\| * \|	Fix failure in current_settings_spec.rbfix-application-setting-nil-cache	Winnie Hellmann	2017-10-20	1	-1/+1
\| \| \|
\| * \|	Prevent ApplicationSetting to cache nil value	Kamil Trzcinski	2017-10-19	3	-1/+24
\| \| \|
* \| \|	Merge branch 'feature/reliable-rspec-with-eval-script' into 'master'	Rémy Coutable	2017-10-20	15	-20/+39
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check for element before execute_script See merge request gitlab-org/gitlab-ce!14898
\| * \| \|	Check for element before evaluate_script	Eric Eastwood	2017-10-19	15	-20/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tip from https://robots.thoughtbot.com/write-reliable-asynchronous-integration-tests-with-capybara#directly-interacting-with-javascript
* \| \| \|	Merge branch 'fix-system-hook-docs' into 'master'	Sean McGivern	2017-10-20	2	-0/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify system hook docs See merge request gitlab-org/gitlab-ce!14957
\| * \| \| \|	Clarify the difference between project_update and project_rename	Joe Marty	2017-10-20	2	-0/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch 'maintenance_policy' into 'master'	Achilleas Pipinellis	2017-10-20	2	-33/+82
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change location of the maintenance policy document See merge request gitlab-org/gitlab-ce!14813
\| * \| \| \| \|	Remove empty lines. [CI skip]maintenance_policy	Marin Jankovski	2017-10-12	1	-2/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Change location of the maintenance policy document. Add version support ↵	Marin Jankovski	2017-10-11	2	-33/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	information. [CI skip]
* \| \| \| \| \|	Merge branch 'tc-page-title-encoding-fix' into 'master'	Winnie Hellmann	2017-10-20	3	-2/+16
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	URI decode Page-Title header to preserve UTF-8 characters Closes #39179 See merge request gitlab-org/gitlab-ce!14929
\| * \| \| \| \| \|	URI decode Page-Title header to preserve UTF-8 characters	Toon Claes	2017-10-20	3	-2/+16
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'gitaly-version-v0.49.0' into 'master'	Rémy Coutable	2017-10-20	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Gitaly version to v0.49.0 See merge request gitlab-org/gitlab-ce!14943
\| * \| \| \| \| \|	Update Gitaly version to v0.49.0	Andrew Newdigate	2017-10-20	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch '31358_decrease_perceived_complexity_threshold_step3' into 'master'	Rémy Coutable	2017-10-20	3	-9/+27
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decrease Perceived Complexity threshold to 14 See merge request gitlab-org/gitlab-ce!14231
\| * \| \| \| \| \|	Decrease Perceived Complexity threshold to 14	Maxim Rydkin	2017-10-20	3	-9/+27
\|/ / / / / /
* \| \| \| \| \|	Merge branch ↵	Sean McGivern	2017-10-20	3	-14/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39297-remove-help-text-regarding-group-issues-on-group-issues-page-and-group-merge-requests-page' into 'master' Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)" Closes #39297 See merge request gitlab-org/gitlab-ce!14963
\| * \| \| \| \| \|	Resolve "Remove help text regarding group issues on group issues page (and ↵	Victor Wu	2017-10-20	3	-14/+5
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	group merge requests page)"
* \| \| \| \| \|	Merge branch 'rc/cleanup-some-jobs' into 'master'	Robert Speicher	2017-10-20	1	-9/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve the build-package and .review-docs jobs See merge request gitlab-org/gitlab-ce!14938
\| * \| \| \| \| \|	Improve the build-package and .review-docs jobsrc/cleanup-some-jobs	Rémy Coutable	2017-10-18	1	-9/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	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