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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Switch to using gettext:compile instead of gettext:pack in the installdocs-install-locale-compile	DJ Mountney	2017-11-20	1	-2/+1
\| \| \| \| \| \| \|	Docs This skips the step that updates the .pot files with changes in the codebase, which can take extra time, and isn't required during install.
*	Merge branch 'fix-mr-cleanup' into 'master'	Sean McGivern	2017-11-20	1	-4/+4
\|\ \| \| \| \| \| \| \| \|	Fix merge_requests.source_project_id migration See merge request gitlab-org/gitlab-ce!15496
\| *	Fix merge_requests.source_project_id migrationfix-mr-cleanup	Yorick Peterse	2017-11-20	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	We need to make sure merge_requests.source_project_id allows NULL values _before_ updating rows as otherwise this will lead to a NOT NULL constraint failing.
* \|	Merge branch '1870-impersonation-stuck-on-password-change-ce' into 'master'	Sean McGivern	2017-11-20	4	-4/+34
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Impersonation no longer gets stuck on password change. Closes #13888 See merge request gitlab-org/gitlab-ce!15497
\| * \|	Fix MR IID in changelog item1870-impersonation-stuck-on-password-change-ce	Douwe Maan	2017-11-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \|	Impersonation no longer gets stuck on password change.	Tiago Botelho	2017-11-20	4	-4/+34
\| \|/
* \|	Merge branch '39497-inline-edit-issue-on-mobile' into 'master'	Annabel Dunstone Gray	2017-11-20	7	-79/+105
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add inline editing to issues on mobile Closes #39497 See merge request gitlab-org/gitlab-ce!15438
\| * \|	Add inline editing to issues on mobile	Eric Eastwood	2017-11-18	7	-79/+105
\| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39497
* \| \|	Merge branch '4080-align-retry-btn' into 'master'	Annabel Dunstone Gray	2017-11-20	3	-1/+7
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Align retry button with job title with new grid size Closes #40342 See merge request gitlab-org/gitlab-ce!15462
\| * \| \|	Align retry button with job title with new grid size	Filipa Lacerda	2017-11-20	3	-1/+7
\|/ / /
* \| \|	Merge branch '40292-bitbucket-import-hashed-storage' into 'master'	Douwe Maan	2017-11-20	3	-5/+37
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bitbucket wiki import with hashed storage enabled Closes #40292 See merge request gitlab-org/gitlab-ce!15490
\| * \| \|	Fix bitbucket wiki import with hashed storage enabled	Nick Thomas	2017-11-20	3	-5/+37
\| \| \| \|
* \| \| \|	Merge branch 'req-docs' into 'master'	Rémy Coutable	2017-11-20	1	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	improve requirements details See merge request gitlab-org/gitlab-ce!15265
\| * \| \| \|	formatting cleanup, swamp details, unicorn defaults	Ben Bodenmiller	2017-11-07	1	-3/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-protected-branches-descriptions' into 'master'	Douwe Maan	2017-11-20	3	-4/+9
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify wording of protected branch settings for the default branch See merge request gitlab-org/gitlab-ce!15492
\| * \| \| \|	Clarify wording of protected branch settings for the default branch	Sean McGivern	2017-11-20	3	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No-one is allowed to force push to a protected branch, or delete it. That's correct in the documentation, but was wrong in the drop-down.
* \| \| \| \|	Merge branch '39167-async-boards-sidebar' into 'master'	Sean McGivern	2017-11-20	20	-100/+174
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Issue Boards sidebar subscriptions async Closes #39167 and #40094 See merge request gitlab-org/gitlab-ce!15364
\| * \| \| \| \|	Async notification subscriptions in issue boards	Eric Eastwood	2017-11-20	17	-99/+165
\| \| \| \| \| \|
\| * \| \| \| \|	Add issue sidebar and toggle_subscription endpoint in board issues data	Oswaldo Ferreira	2017-11-20	3	-1/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'qa/gb/tmp-fix-mattermost-failures' into 'master'	Rémy Coutable	2017-11-20	1	-0/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement a workaround for QA mattermost failures Closes gitlab-qa#102 See merge request gitlab-org/gitlab-ce!15486
\| * \| \| \| \| \|	Implement a workaround for QA mattermost failuresqa/gb/tmp-fix-mattermost-failures	Grzegorz Bizon	2017-11-20	1	-0/+11
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'remove-pretty-time' into 'master'	Phil Hughes	2017-11-20	1	-1/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove pretty time from main.js See merge request gitlab-org/gitlab-ce!15459
\| * \| \| \| \| \|	Remove pretty time from main.js	Filipa Lacerda	2017-11-20	1	-1/+0
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'qa/gb/add-docker-to-qa-image' into 'master'	Rémy Coutable	2017-11-20	1	-0/+7
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Docker binaries to instance image of GitLab QA See merge request gitlab-org/gitlab-ce!15489
\| * \| \| \| \|	Add Docker binaries to instance image of GitLab QA	Grzegorz Bizon	2017-11-20	1	-0/+7
\| \|/ / / /
* \| \| \| \|	Merge branch 'gitaly-delete-refs' into 'master'	Douwe Maan	2017-11-20	7	-5/+59
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Incorporate Gitaly's RefService.DeleteRefs RPC Closes gitaly#740 See merge request gitlab-org/gitlab-ce!15460
\| * \| \| \|	Incorporate Gitaly's RefService.DeleteRefs RPCgitaly-delete-refs	Alejandro Rodríguez	2017-11-17	7	-5/+59
\| \| \| \| \|
* \| \| \| \|	Merge branch '38451-fe-sprite-icons-vue-component' into 'master'	Annabel Dunstone Gray	2017-11-20	2	-9/+28
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Icons Documentation about Icon Vue Component Closes #38451 See merge request gitlab-org/gitlab-ce!15171
\| * \| \| \| \|	Added info about tracking38451-fe-sprite-icons-vue-component	Tim Zallmann	2017-11-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Added + Updated Document for Vue Component	Tim Zallmann	2017-11-16	2	-8/+27
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'osw-merge-process-logs' into 'master'	Sean McGivern	2017-11-20	2	-0/+17
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add logs for monitoring the merge process See merge request gitlab-org/gitlab-ce!15425
\| * \| \| \| \|	Add MR reference to logs	Oswaldo Ferreira	2017-11-20	1	-5/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Add logs for monitoring the merge processosw-merge-process-logs	Oswaldo Ferreira	2017-11-16	2	-0/+17
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'bvl-dont-move-projects-using-hashed-storage' into 'master'	Douwe Maan	2017-11-20	4	-3/+38
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't move project repository/attachments when using hashed storage Closes #40289 See merge request gitlab-org/gitlab-ce!15479
\| * \| \| \| \| \|	Don't move project repository/attachments when using hashed storage	Bob Van Landuyt	2017-11-20	4	-3/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a project is using hashed storage, the repositories and attachments wouldn't be saved on disk using the `full_path`. So the migration would not do anything. However: best to just skip moving when hashed storage is enabled.
* \| \| \| \| \| \|	Merge branch 'merge-requests-schema-cleanup' into 'master'	Sean McGivern	2017-11-20	11	-5/+276
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up schema of the "merge_requests" table Closes #31825 See merge request gitlab-org/gitlab-ce!15377
\| * \| \| \| \| \| \|	Clean up schema of the "merge_requests" table	Yorick Peterse	2017-11-20	11	-5/+276
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds various foreign keys and indexes to the "merge_requests" table as outlined in https://gitlab.com/gitlab-org/gitlab-ce/issues/31825. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/31825
* \| \| \| \| \| \| \|	Merge branch '40335-master-is-broken-due-to-static-analysis' into 'master'	Sean McGivern	2017-11-20	1	-0/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "`master` is broken due to `static-analysis`" Closes #40335 See merge request gitlab-org/gitlab-ce!15481
\| * \| \| \| \| \| \| \|	Fix offense to the LineBreakAfterGuardClauses cop40335-master-is-broken-due-to-static-analysis	Rémy Coutable	2017-11-20	1	-0/+2
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \|	Merge branch 'docs/gb/update-pipeline-badge-docs' into 'master'	Rémy Coutable	2017-11-20	2	-2/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update pipeline status badge details docs Closes #40316 See merge request gitlab-org/gitlab-ce!15483
\| * \| \| \| \| \| \| \|	Update pipeline status badge details docsdocs/gb/update-pipeline-badge-docs	Grzegorz Bizon	2017-11-20	2	-2/+4
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'docs/use-slug-as-prefix-in-ci-docs-job' into 'master'	Rémy Coutable	2017-11-20	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use slug as the prefix for the docs CI job preview URL See merge request gitlab-org/gitlab-ce!15450
\| * \| \| \| \| \| \| \|	Use slug as the prefix for the docs CI job preview URLdocs/use-slug-as-prefix-in-ci-docs-job	Achilleas Pipinellis	2017-11-17	2	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '38393-Milestone-duration-error-message-is-not-accurate-enough' ↵	Sean McGivern	2017-11-20	3	-2/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Changed validation error message on wrong milestone dates Closes #38393 See merge request gitlab-org/gitlab-ce!15471
\| * \| \| \| \| \| \| \| \|	Changed validation error message on wrong milestone dates	Xurxo Méndez Pérez	2017-11-18	3	-2/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch-9' into 'master'	Sean McGivern	2017-11-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doc: schedules.md: fix only-and-except anchor link See merge request gitlab-org/gitlab-ce!15473
\| * \| \| \| \| \| \| \| \|	schedules.md: fix only-and-except anchor link	Elan Ruusamäe	2017-11-19	1	-1/+1
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'fix-conflict-highlighting' into 'master'	Douwe Maan	2017-11-20	3	-4/+11
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix conflict highlighting See merge request gitlab-org/gitlab-ce!15463
\| * \| \| \| \| \| \| \| \|	Fix conflict highlightingfix-conflict-highlighting	Sean McGivern	2017-11-17	3	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts used to take a `Repository` and pass that to `Gitlab::Highlight.highlight`, which would call `#gitattribute` on the repository. Now they use a `Gitlab::Git::Repository`, which didn't have that method defined - but defining it on `Gitlab::Git::Repository` does make it available on `Repository` through `method_missing`, so we can do that and both cases will work.
* \| \| \| \| \| \| \| \| \|	Merge branch '39727-axios-all-the-things' into 'master'	Phil Hughes	2017-11-20	12	-162/+128
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use axios instead of vue resource - step 1 See merge request gitlab-org/gitlab-ce!15339