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

	Commit message (Collapse)	Author	Age	Files	Lines
*	fix conflictsdocs-move-article-autoscaling-runner-aws	Marcia Ramos	2018-01-12	418	-2061/+4945
\|\
\| *	Merge branch 'grpc-1.8.3' into 'master'	Sean McGivern	2018-01-12	1	-2/+5
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Update the grpc gem to 1.8.3 See merge request gitlab-org/gitlab-ce!16354
\| \| *	Update the grpc gem to 1.8.3grpc-1.8.3	Jacob Vosmaer	2018-01-10	1	-2/+5
\| \| \|
\| * \|	Merge branch 'docs/qa/gb/add-note-about-qa-selectors-validation-to-docs' ↵	Rémy Coutable	2018-01-12	1	-0/+11
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Add a note about GitLab QA page objects validator to docs See merge request gitlab-org/gitlab-ce!16424
\| \| * \|	Add a note about GitLab QA page objects validator to docs	Grzegorz Bizon	2018-01-12	1	-0/+11
\| \|/ /
\| * \|	Merge branch '41956-fix-ctrl-enter-binding-to-save-comment' into 'master'	Phil Hughes	2018-01-12	5	-4/+26
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Ctrl+Enter keyboard shortcut saving comment/note edit Closes #41956 See merge request gitlab-org/gitlab-ce!16415
\| \| * \|	Fix Ctrl+Enter keyboard shortcut saving comment/note edit41956-fix-ctrl-enter-binding-to-save-comment	Eric Eastwood	2018-01-11	5	-4/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41956
\| * \| \|	Merge branch 'dispatcher-project-branches' into 'master'	Phil Hughes	2018-01-12	2	-4/+10
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor dispatcher project branches path See merge request gitlab-org/gitlab-ce!16398
\| \| * \| \|	Refactor dispatcher project branches pathdispatcher-project-branches	Clement Ho	2018-01-11	2	-4/+10
\| \| \| \| \|
\| * \| \| \|	Merge branch 'dispatcher-blame-blob' into 'master'	Phil Hughes	2018-01-12	4	-34/+52
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor dispatcher projects blame and blob path See merge request gitlab-org/gitlab-ce!16369
\| \| * \| \| \|	Refactor dispatcher projects blame and blob path	Clement Ho	2018-01-12	4	-34/+52
\| \|/ / / /
\| * \| \| \|	Merge branch 'fix/export-message' into 'master'	Stan Hu	2018-01-12	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update export message to mention we can download the file from the UI See merge request gitlab-org/gitlab-ce!16419
\| \| * \| \| \|	Update export message to mention we can download the file from the UI	James Lopez	2018-01-12	1	-1/+1
\| \|/ / / /
\| * \| \| \|	Merge branch '41882-respect-only-path-in-relative-link-filter' into 'master'	Douwe Maan	2018-01-12	3	-17/+51
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Attachments in e-mail notifications are using the wrong URL" Closes #41882 See merge request gitlab-org/gitlab-ce!16364
\| \| * \| \| \|	Ensure that emails contain absolute, rather than relative, links to user uploads	Nick Thomas	2018-01-11	3	-17/+51
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'mk-fix-permanent-redirect-validation' into 'master'	Douwe Maan	2018-01-12	4	-1/+81
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Route validation when conflicting permanent redirects exist Closes gitlab-com/support-forum#2883 and #41786 See merge request gitlab-org/gitlab-ce!16397
\| \| * \| \| \| \|	Add changelog entrymk-fix-permanent-redirect-validation	Michael Kozono	2018-01-11	1	-0/+5
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add RedirectRoute factory	Michael Kozono	2018-01-11	2	-3/+18
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix Rubocop offense	Michael Kozono	2018-01-11	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Revert "Revert "Fix Route validation for unchanged path""	Michael Kozono	2018-01-11	2	-1/+61
\| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 3576d59ae95a61dd20e997a619dbc6c8e8a70276.
\| * \| \| \| \|	Merge branch ↵	Fatih Acet	2018-01-12	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'37077-subscribe-button-tooltip-on-issues-page-causes-visual-stuttering' into 'master' Resolve "Subscribe button tooltip on issues page causes visual stuttering" Closes #37077 See merge request gitlab-org/gitlab-ce!16411
\| \| * \| \| \| \|	fix case where tooltip messes up :last-child selector37077-subscribe-button-tooltip-on-issues-page-causes-visual-stuttering	Mike Greiling	2018-01-11	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch '41749-postgres-9.6-for-ci-tests' into 'master'	Rémy Coutable	2018-01-12	2	-0/+8
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add reason to keep postgresql 9.2 for CI See merge request gitlab-org/gitlab-ce!16277
\| \| * \| \| \| \|	Add reason to keep postgresql 9.2 for CI	Takuya Noguchi	2018-01-12	2	-0/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'feature/migrate-is-rebase-in-progress-to-gitaly' into 'master'	Robert Speicher	2018-01-11	3	-24/+53
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate rebase_in_progress? to Gitaly Closes gitaly#866 See merge request gitlab-org/gitlab-ce!16286
\| \| * \| \| \| \| \|	Migrate rebase_in_progress? to Gitalyfeature/migrate-is-rebase-in-progress-to-gitaly	Ahmad Sherif	2018-01-10	3	-24/+53
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#866
\| * \| \| \| \| \|	Merge branch 'feature/migrate-rebase-to-gitaly' into 'master'	Robert Speicher	2018-01-11	3	-59/+133
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Gitlab::Git::Repository#rebase to Gitaly Closes gitaly#863 See merge request gitlab-org/gitlab-ce!16259
\| \| * \| \| \| \| \|	Migrate Gitlab::Git::Repository#rebase to Gitalyfeature/migrate-rebase-to-gitaly	Ahmad Sherif	2018-01-10	3	-59/+133
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#863
\| * \| \| \| \| \|	Merge branch 'sh-remove-import-retry-count-warning' into 'master'	Robert Speicher	2018-01-11	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove warning noise in ProjectImportOptions See merge request gitlab-org/gitlab-ce!16410
\| \| * \| \| \| \| \|	Remove warning noise in ProjectImportOptions	Stan Hu	2018-01-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Squlches these warnings: ``` /opt/gitlab/embedded/service/gitlab-rails/app/workers/concerns/project_import_options.rb:5: warning: already initialized constant ProjectImportOptions::IMPORT_RETRY_COUNT /opt/gitlab/embedded/service/gitlab-rails/app/workers/concerns/project_import_options.rb:5: warning: previous definition of IMPORT_RETRY_COUNT was here ```
\| * \| \| \| \| \| \|	Merge branch 'dispatcher-dashboard-mr' into 'master'	Fatih Acet	2018-01-11	2	-3/+10
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor dispatcher dashboard mr path See merge request gitlab-org/gitlab-ce!16360
\| \| * \| \| \| \| \| \|	Remove initLegacyFilters reference in dispatcherdispatcher-dashboard-mr	Clement Ho	2018-01-10	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Refactor dispatcher dashboard mr path	Clement Ho	2018-01-10	2	-2/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'dispatcher-boards' into 'master'	Fatih Acet	2018-01-11	2	-2/+11
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor dispatcher project boards path See merge request gitlab-org/gitlab-ce!16374
\| \| * \| \| \| \| \| \| \|	Refactor dispatcher project boards pathdispatcher-boards	Clement Ho	2018-01-10	2	-2/+11
\| \| \|/ / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch '41163-improve-cluster-ingress-extra-cost-language' into 'master'	Fatih Acet	2018-01-11	2	-6/+12
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve wording about additional costs with Ingress on GKE or custom clusters Closes #41163 See merge request gitlab-org/gitlab-ce!16370
\| \| * \| \| \| \| \| \|	Update Ingress extra cost note to be more generic41163-improve-cluster-ingress-extra-cost-language	Eric Eastwood	2018-01-11	2	-6/+12
\| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41163
\| * \| \| \| \| \| \|	Merge branch ↵	Annabel Dunstone Gray	2018-01-11	1	-1/+0
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'41221-padding-is-wrong-for-pipeline-dropdowns-on-current-master' into 'master' Fix padding for pipeline dropdowns after bad merge Closes #41221 See merge request gitlab-org/gitlab-ce!15982
\| \| * \| \| \| \| \| \|	Remove wrong padding from pipelines.scss41221-padding-is-wrong-for-pipeline-dropdowns-on-current-master	Winnie Hellmann	2017-12-18	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'main-js-tidy-up' into 'master'	Filipa Lacerda	2018-01-11	49	-140/+145
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tidy up main JS file See merge request gitlab-org/gitlab-ce!16007
\| \| * \| \| \| \| \| \| \|	Tidy up main JS filemain-js-tidy-up	Phil Hughes	2018-01-10	49	-140/+145
\| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Luke Bennett	2018-01-11	550	-6993/+10355
\| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch '41607-require-rsync-docs' into 'master'	Achilleas Pipinellis	2018-01-11	3	-5/+20
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Document rsync as requirement for 10.4" Closes #41607 See merge request gitlab-org/gitlab-ce!16252
\| \| \| * \| \| \| \| \| \|	Document that we need rsync for backing up	Lin Jen-Shin	2018-01-12	3	-5/+20
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'docs-move-article-laravel-envoy' into 'master'	Achilleas Pipinellis	2018-01-11	19	-682/+687
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: move article "Laravel and Envoy w/ CI/CD" See merge request gitlab-org/gitlab-ce!16359
\| \| \| * \| \| \| \| \| \| \|	Docs: move article "Laravel and Envoy w/ CI/CD"	Marcia Ramos	2018-01-11	19	-682/+687
\| \| \| \|/ / / / / / /
\| \| * \| \| \| \| \| \| \|	Merge branch 'docs-move-article-openshift' into 'master'	Achilleas Pipinellis	2018-01-11	19	-512/+512
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: move GitLab/Openshift article to its topic-related dir See merge request gitlab-org/gitlab-ce!16367
\| \| \| * \| \| \| \| \| \|	move article to its topic-related dir, update linksdocs-move-article-openshift	Marcia Ramos	2018-01-10	19	-512/+512
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'docs/add-aws-reference-diagram' into 'master'	Achilleas Pipinellis	2018-01-11	2	-0/+4
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port gitlab-ee MR 3981 to CE See merge request gitlab-org/gitlab-ce!16371
\| \| \| * \| \| \| \| \| \| \|	Port gitlab-ee MR 3981 to CEdocs/add-aws-reference-diagram	Brendan O'Leary	2018-01-10	2	-0/+4
\| \| \| \| \|_\|_\|/ / / / \| \| \| \|/\| \| \| \| \| \|