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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '53636-fix-rendering-of-any-user-filter' into 'master'11-5-stable-prepare-rc9	Clement Ho	2018-11-14	3	-17/+54
\| \| \| \| \| \| \|	Disable updating appearance of filter tokens for special values Closes #53636 See merge request gitlab-org/gitlab-ce!22865
*	Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'	Douwe Maan	2018-11-14	21	-60/+1264
\| \| \| \| \| \| \|	Comment on any expanded diff line on MRs (with feature-flag) Closes #13950 See merge request gitlab-org/gitlab-ce!22914
*	Merge branch 'docs/markup-languages' into 'master'	Marcia Ramos	2018-11-14	1	-10/+24
\| \| \| \| \|	Add a new markup languages section See merge request gitlab-org/gitlab-ce!22921
*	Merge branch '53918-snippet-commit-comments' into 'master'	Fatih Acet	2018-11-14	2	-4/+24
\| \| \| \| \| \| \|	Fix styling of snippet and commit discussion comments Closes #53918 See merge request gitlab-org/gitlab-ce!23035
*	Merge branch 'qa-fix-git-protocol-v2-spec' into 'master'	Rémy Coutable	2018-11-14	1	-2/+2
\| \| \| \| \| \| \|	Fix Git protocol v2 e2e test Closes gitlab-org/quality/staging#16 See merge request gitlab-org/gitlab-ce!23067
*	Merge branch 'discussion-fixes-2' into 'master'	Fatih Acet	2018-11-14	2	-2/+2
\| \| \| \| \| \| \|	Fix vertical line alignment in discussion & diff border-radius Closes #53975 See merge request gitlab-org/gitlab-ce!23075
*	Merge branch 'dark-theme-comments' into 'master'	Fatih Acet	2018-11-14	1	-0/+4
\| \| \| \| \|	Add white background to commit diff comments See merge request gitlab-org/gitlab-ce!23078
*	Merge branch 'dm-commit-email-select-options' into 'master'	Stan Hu	2018-11-14	3	-3/+13
\| \| \| \| \| \| \|	Fix bug causing not all emails to show up in commit email selectbox Closes #54045 See merge request gitlab-org/gitlab-ce!23079
*	Merge branch ↵	Phil Hughes	2018-11-14	2	-2/+7
\| \| \| \| \| \| \| \| \|	'54002-activity-feed-missing-padding-in-event-note-when-a-branch-is-deleted' into 'master' Resolve "Activity Feed - Missing padding in event note when a branch is deleted" Closes #54002 See merge request gitlab-org/gitlab-ce!23038
*	Merge branch 'add-documentation-for-git-operations-stack-trace' into 'master'	Douwe Maan	2018-11-14	1	-0/+15
\| \| \| \| \| \| \| \| \| \|	Adds documentation of git trace when git push/pull times out See merge request gitlab-org/gitlab-ce!23016 (cherry picked from commit 9d5d7c83e20b6f964f22cb7ada488997e08df105) 30bfef30 Adds documentation of git trace when git push/pull times out db6913cb Adds comma after "timings" in git troubleshooting documentation
*	Update VERSION to 11.5.0-rc8v11.5.0-rc8	GitLab Release Tools Bot	2018-11-14	1	-1/+1
\|
*	Merge branch '11-5-stable-prepare-rc8' into '11-5-stable'	Steve Azzopardi	2018-11-14	27	-111/+632
\|\ \| \| \| \| \| \| \| \|	Prepare 11.5 RC8 release See merge request gitlab-org/gitlab-ce!23032
\| *	Merge branch '53780-commit-discussion-ui' into 'master'11-5-stable-prepare-rc8	Fatih Acet	2018-11-13	5	-22/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken UI on commit discussions Closes #53780 See merge request gitlab-org/gitlab-ce!22952
\| *	Merge branch 'upgrade-workhorse-7-1-0' into 'master'	Nick Thomas	2018-11-13	2	-1/+6
\| \| \| \| \| \| \| \| \| \|	Update GitLab-Workhorse to 7.1.0 See merge request gitlab-org/gitlab-ce!22883
\| *	Merge branch 'archive-builds-documentation' into 'master'	Achilleas Pipinellis	2018-11-13	2	-5/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation for archive builds Closes #53534 See merge request gitlab-org/gitlab-ce!22909
\| *	Merge branch 'patch-31' into 'master'	Stan Hu	2018-11-13	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set an empty entrypoint for license_management job Closes #53786 See merge request gitlab-org/gitlab-ce!22955
\| *	Merge branch 'rs-revert-api' into 'master'	Nick Thomas	2018-11-13	5	-2/+199
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add revert to commits API Closes gitlab-org/release/framework#48 See merge request gitlab-org/gitlab-ce!22919
\| *	Merge branch 'dm-disable-codeowners' into 'master'	Sean McGivern	2018-11-13	1	-0/+0
\| \| \| \| \| \| \| \| \| \|	Disable CODEOWNERS for the time being See merge request gitlab-org/gitlab-ce!22991
\| *	Merge branch 'align-vertical-discussion-line' into 'master'	Fatih Acet	2018-11-13	1	-3/+3
\| \| \| \| \| \| \| \| \| \|	Align all avatars and system notes in discussion See merge request gitlab-org/gitlab-ce!22994
\| *	Merge branch '_acet-discussion-redesign-fixes' into 'master'	Annabel Dunstone Gray	2018-11-13	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Border radius fixes for redesigned discussions Closes #53880 and #53767 See merge request gitlab-org/gitlab-ce!23006
\| *	Merge branch 'enable-image-comments-for-renamed-files' into 'master'	Filipa Lacerda	2018-11-13	2	-2/+25
\| \| \| \| \| \| \| \| \| \|	Fixed image commenting on moved files See merge request gitlab-org/gitlab-ce!23023
\| *	Merge branch '53888-missing-favicon' into 'master'	Phil Hughes	2018-11-13	2	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds back missing CI favicon Closes #53888 See merge request gitlab-org/gitlab-ce!23002
\| *	Merge branch '53972-fix-fill-shards' into 'master'	Stan Hu	2018-11-13	2	-6/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a race condition in the shard population logic Closes #53972 See merge request gitlab-org/gitlab-ce!23028
\| *	Merge branch 'docs-document_new_reports_syntax-ce' into 'master'	Achilleas Pipinellis	2018-11-14	5	-64/+318
\|/ \| \| \| \| \| \| \| \| \| \| \|	Document new report types See merge request gitlab-org/gitlab-ce!22828 (cherry picked from commit 502d0b4d18e40ea19e609db4da117a199ba4971c) 2e7de887 Document new report types ed002d0a MR feedback review 9656b423 Update examples with old and new syntax 4169531f Capitalize report name
*	Update VERSION to 11.5.0-rc7v11.5.0-rc7	GitLab Release Tools Bot	2018-11-13	1	-1/+1
\|
*	Merge branch '11-5-stable-prepare-rc7' into '11-5-stable'	Steve Azzopardi	2018-11-13	7	-4/+65
\|\ \| \| \| \| \| \| \| \|	Prepare 11.5 RC7 release See merge request gitlab-org/gitlab-ce!23015
\| *	Merge branch '53879-kube-token-nil' into 'master'	Kamil Trzciński	2018-11-13	7	-4/+65
\|/ \| \| \| \| \| \|	Fix deployment jobs using nil token Closes #53879 See merge request gitlab-org/gitlab-ce!23009
*	Update VERSION to 11.5.0-rc6v11.5.0-rc6	GitLab Release Tools Bot	2018-11-13	1	-1/+1
\|
*	Merge branch '11-5-stable-prepare-rc6' into '11-5-stable'	Steve Azzopardi	2018-11-13	5	-8/+23
\|\ \| \| \| \| \| \| \| \|	Prepare 11.5 RC6 release See merge request gitlab-org/gitlab-ce!22997
\| *	Merge branch 'fix-tags-for-envs' into 'master'11-5-stable-prepare-rc6	Stan Hu	2018-11-12	3	-7/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tags for environments Closes gitlab-ee#8397 See merge request gitlab-org/gitlab-ce!22993
\| *	Merge branch 'sh-fix-refresh-service-deleted-branch' into 'master'	Douwe Maan	2018-11-12	2	-1/+5
\|/ \| \| \| \| \| \|	Fix MergeRequestService erroring out on deleted branch Closes #53853 See merge request gitlab-org/gitlab-ce!22989
*	Update VERSION to 11.5.0-rc5v11.5.0-rc5	GitLab Release Tools Bot	2018-11-12	1	-1/+1
\|
*	Merge branch '11-5-stable-prepare-rc5' into '11-5-stable'	Steve Azzopardi	2018-11-12	12	-25/+81
\|\ \| \| \| \| \| \| \| \|	Prepare 11.5 RC5 release See merge request gitlab-org/gitlab-ce!22981
\| *	Merge branch '53768-diff-comment-action-btns' into 'master'11-5-stable-prepare-rc5	Phil Hughes	2018-11-12	2	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix alignment of diff comment buttons Closes #53768 See merge request gitlab-org/gitlab-ce!22944 (cherry picked from commit d5027d774b2c26a2ee29b249b9919197ce499bff) a597103a Fix alignment of diff comment buttons
\| *	Merge branch 'docs-zj-hooks-update' into 'master'	Marcia Ramos	2018-11-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Symlinked hooks aren't executed See merge request gitlab-org/gitlab-ce!22933 (cherry picked from commit 04c55292a5b5624aced5b42d390010e0a2de734d) ec6363d6 Symlinked hooks aren't executed
\| *	Merge branch 'fix-error-handling-bugs-in-kubernetes-integration' into 'master'	Dmitriy Zaporozhets	2018-11-12	4	-3/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error handling bugs in kubernetes integration See merge request gitlab-org/gitlab-ce!22922 (cherry picked from commit f69f7a6702f68a14cb29b2686b030f36711cef7f) b9916610 Remove special handling for 404 response from K8s f852b235 Fix error handling in cluster_platform_configure_worker 269b0e10 Add changelog for fixing k8s integration error handling
\| *	Merge branch 'notes-multiple-discussion-fetches' into 'master'	Filipa Lacerda	2018-11-12	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stop multiple discussion requests See merge request gitlab-org/gitlab-ce!22908 (cherry picked from commit bd3a793fb781f36711baf6875e2f4e4a8de54ad8) 1519c347 Stop multiple discussion requests
\| *	Merge branch 'always-proxy-reports' into 'master'	Grzegorz Bizon	2018-11-12	4	-17/+51
\|/ \| \| \| \| \| \| \| \|	backport: Always proxy reports downloads See merge request gitlab-org/gitlab-ce!22889 (cherry picked from commit ef58a64039c517be7df08eef1b3a7af7ad5eab16) 5da2f42d backport: Always proxy reports downloads
*	Update VERSION to 11.5.0-rc4v11.5.0-rc4	GitLab Release Tools Bot	2018-11-09	1	-1/+1
\|
*	Merge branch '11-5-stable-prepare-rc4' into '11-5-stable'	Steve Azzopardi	2018-11-09	913	-5525/+16673
\|\ \| \| \| \| \| \| \| \|	Prepare 11.5 RC4 release See merge request gitlab-org/gitlab-ce!22900
\| *	Merge branch 'revert_issue_board_entity' into 'master'	Stan Hu	2018-11-09	11	-118/+34
\| \| \| \| \| \| \| \| \| \|	Revert "Extract code into IssueBoardEntity" See merge request gitlab-org/gitlab-ce!22928
\| *	Merge branch 'limit-parallel-to-100' into 'master'	Grzegorz Bizon	2018-11-09	3	-2/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Limit parallel to 50 Closes #53711 See merge request gitlab-org/gitlab-ce!22907
\| *	Merge branch 'update-dependencies-list-11-5' into 'master'	Sean McGivern	2018-11-09	1	-27/+25
\| \| \| \| \| \| \| \| \| \|	Update license list See merge request gitlab-org/gitlab-ce!22904
\| *	Merge branch 'docs/fix-version-number-ce-doc' into 'master'11-5-stable-prepare-rc4	Achilleas Pipinellis	2018-11-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature backported to CE in 11.5, not 10.7 Closes #53648 See merge request gitlab-org/gitlab-ce!22892
\| *	Merge branch 'osw-revert-comment-in-any-diff-line' into 'master'	Sean McGivern	2018-11-08	26	-1234/+89
\| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'" See merge request gitlab-org/gitlab-ce!22891
\| *	Merge branch 'update-templates' into 'master'	Douwe Maan	2018-11-08	13	-12/+165
\| \| \| \| \| \| \| \| \| \|	Run rake gitlab:update_templates See merge request gitlab-org/gitlab-ce!22903
\| *	Merge branch 'master' into 11-5-stable-prepare-rc4	Steve Azzopardi	2018-11-08	930	-5610/+17825
\| \|\ \|/ /
\| *	Merge branch '_acet-discussion-redesign' into 'master'	Mike Greiling	2018-11-08	24	-276/+629
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Discussions redesign Closes #29294 See merge request gitlab-org/gitlab-ce!22333
\| \| *	Discussions redesign	Fatih Acet	2018-11-08	24	-276/+629
\| \|/
\| *	Merge branch 'ee-backport-4753-tracing-mvc' into 'master'	Sean McGivern	2018-11-08	3	-5/+26
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	backport changes from gitlab-ee!7903 See merge request gitlab-org/gitlab-ce!22767