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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into sh-headless-chrome-support	Mike Greiling	2017-10-23	182	-2348/+3438
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (297 commits) Fix deletion of container registry or images returning an error The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix: Decrease ABC threshold to 54.28 Update VERSION to 10.2.0-pre Update CHANGELOG.md for 10.1.0 Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT` Fix the external URLs generated for online view of HTML artifacts Use title as placeholder instead of issue title for reusability Fix failure in current_settings_spec.rb Clarify the difference between project_update and project_rename URI decode Page-Title header to preserve UTF-8 characters Update Gitaly version to v0.49.0 Decrease Perceived Complexity threshold to 14 Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)" Force non diff resolved discussion to display when collapse toggled Added submodule support in multi-file editor add note about after_script being run separately Check for element before evaluate_script Merge branch 'master-i18n' into 'master' Update Prometheus gem to fix problems with other files overwriting current file ...
\| *	Merge branch 'sh-fix-container-registry-destroy' into 'master'	Filipa Lacerda	2017-10-23	1	-4/+2
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix deletion of container registry or images returning an error Closes #39354 See merge request gitlab-org/gitlab-ce!14992
\| \| *	Fix deletion of container registry or images returning an error	Stan Hu	2017-10-23	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A successful DELETE call would result in a 204 No Content result, which would have an empty response body. Don't automatically try to parse this value as JSON both because there is no additional information passed in the response body. Closes #39354
\| * \|	Merge branch 'bvl-fix-group-atom-feed' into 'master'	Douwe Maan	2017-10-22	1	-0/+11
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure we render events for projects within a group Closes #39305 See merge request gitlab-org/gitlab-ce!14974
\| \| * \|	Make sure we render events for projects within a group	Bob Van Landuyt	2017-10-20	1	-0/+11
\| \| \| \|
\| * \| \|	Fix the external URLs generated for online view of HTML artifacts	Nick Thomas	2017-10-20	1	-6/+11
\| \| \| \|
\| * \| \|	Merge branch 'multi-file-editor-submodules' into 'master'	Filipa Lacerda	2017-10-20	4	-3/+26
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-3/+26
\| \| \| \| \|
\| * \| \| \|	Use title as placeholder instead of issue title for reusability	Clement Ho	2017-10-20	1	-4/+4
\| \| \| \| \|
\| * \| \| \|	Merge branch 'fix-application-setting-nil-cache' into 'master'	Winnie Hellmann	2017-10-20	1	-1/+4
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent ApplicationSetting to cache nil value Closes #39275 See merge request gitlab-org/gitlab-ce!14952
\| \| * \| \| \|	Prevent ApplicationSetting to cache nil value	Kamil Trzcinski	2017-10-19	1	-1/+4
\| \| \| \| \| \|
\| * \| \| \| \|	URI decode Page-Title header to preserve UTF-8 characters	Toon Claes	2017-10-20	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Decrease Perceived Complexity threshold to 14	Maxim Rydkin	2017-10-20	1	-8/+21
\| \| \| \| \| \|
\| * \| \| \| \|	Resolve "Remove help text regarding group issues on group issues page (and ↵	Victor Wu	2017-10-20	2	-14/+0
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	group merge requests page)"
\| * \| \| \|	Force non diff resolved discussion to display when collapse toggled	Clement Ho	2017-10-20	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch '37391-wiki-disk-path-helper' into 'master'	Nick Thomas	2017-10-20	1	-1/+1
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Use wiki.disk_path See merge request gitlab-org/gitlab-ce!14930
\| \| * \| \|	Use wiki.disk_path	Nick Thomas	2017-10-18	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'animate-auto-devops' into 'master'	Annabel Dunstone Gray	2017-10-20	2	-2/+13
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-2/+13
\| \| \| \| \| \|
\| * \| \| \| \|	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 'not-found-in-commits' into 'master'	Douwe Maan	2017-10-19	1	-0/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'sh-fix-broken-docker-delete' into 'master'	Grzegorz Bizon	2017-10-19	3	-3/+3
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 '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
\| \| \|/ / / / / /
\| * \| \| \| \| \| \|	Remove dropzoneInput from global namespace	Filipa Lacerda	2017-10-19	5	-306/+268
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '36160-zindex' into 'master'	Annabel Dunstone Gray	2017-10-18	1	-0/+5
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'pms-fix-tooltip-padding' into 'master'	Annabel Dunstone Gray	2017-10-18	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tooltip padding to align to 8px grid See merge request gitlab-org/gitlab-ce!14928
\| \| * \| \| \| \| \| \|	Fix tooltip padding to align to 8px gridpms-fix-tooltip-padding	Pedro Moreira da Silva	2017-10-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'bvl-fix-locale-path' into 'master'	Tim Zallmann	2017-10-18	2	-1/+5
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Render region codes for locale assets with an `_` instead of a `-` Closes #39225 See merge request gitlab-org/gitlab-ce!14924
\| \| * \| \| \| \| \| \| \|	Build the locale path with an `_` instead of a `-`	Bob Van Landuyt	2017-10-18	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The locale code is turned into an asset path with an underscore instead of a dash. The language codes are transformed by `I18n.locale` into a code with a dash. But the resources for translating are always stored in a path using a `_` separating the language and the region code.
\| * \| \| \| \| \| \| \| \|	Merge branch 'add-lazy-option-to-user-avatar-image-component' into 'master'	Tim Zallmann	2017-10-18	1	-8/+23
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add lazy option to UserAvatarImage See merge request gitlab-org/gitlab-ce!14895
\| \| * \| \| \| \| \| \| \| \|	Add lazy option to UserAvatarImageadd-lazy-option-to-user-avatar-image-component	Eric Eastwood	2017-10-17	1	-8/+23
\| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix resolved discussions not expanding on side by side view	Clement Ho	2017-10-18	1	-2/+2
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix Pikaday	Filipa Lacerda	2017-10-18	8	-46/+70
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '39201-improve-google-image' into 'master'35616-gke-1st-iteration	Phil Hughes	2017-10-18	2	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace google login image Closes #39201 See merge request gitlab-org/gitlab-ce!14919
\| \| * \| \| \| \| \| \|	Replace google login image39201-improve-google-image	Filipa Lacerda	2017-10-17	2	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'sh-security-fix-backports-master' into 'master'	Robert Speicher	2017-10-18	6	-20/+15
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport all fixes from GitLab 10.1 into master See merge request gitlab-org/gitlab-ce!14922
\| \| * \ \ \ \ \ \ \	Merge branch 'master' into sh-security-fix-backports-master	Stan Hu	2017-10-17	105	-1340/+2337
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'security-10-1' into '10-1-stable'	Jen-Shin Lin	2017-10-17	6	-20/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Security fixes for 10.1 RC See merge request gitlab/gitlabhq!2209
\| * \| \| \| \| \| \| \| \|	Merge branch '30140-restore-readme-only-preference' into 'master'	Douwe Maan	2017-10-18	3	-8/+27
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add readme only option as project view Closes #30140 See merge request gitlab-org/gitlab-ce!14900
\| \| * \| \| \| \| \| \| \|	Small code style changes	Douwe Maan	2017-10-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add readme title and check for rich_viewer30140-restore-readme-only-preference	Annabel Dunstone Gray	2017-10-17	1	-1/+6
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fix spec	Annabel Dunstone Gray	2017-10-16	1	-1/+0
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add readme only option as project view	Annabel Dunstone Gray	2017-10-16	3	-8/+23
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master'	Grzegorz Bizon	2017-10-18	2	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add short_revision and use total_size Closes #39203 See merge request gitlab-org/gitlab-ce!14917