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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update pg to ~> 1.1pravi/gitlab-ce-update-pg	Pirate Praveen	2019-01-08	2	-3/+3
\|
*	Merge branch 'ac-releases-api-with-assets-follow-up-fe' into 'master'	Phil Hughes	2019-01-08	4	-1/+62
\|\ \| \| \| \| \| \| \| \|	Add feature spec for Release page MVC See merge request gitlab-org/gitlab-ce!24143
\| *	Add feature spec for Release page MVC	Shinya Maeda	2019-01-08	4	-1/+62
\|/
*	Merge branch '56076-releases-margin' into 'master'	Phil Hughes	2019-01-08	2	-1/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fixes missing margin in releases block Closes #56076 See merge request gitlab-org/gitlab-ce!24229
\| *	Fixes missing margin in releases block	Filipa Lacerda	2019-01-08	2	-1/+6
\| \|
* \|	Merge branch 'winh-run-frontend-tests-docs' into 'master'	Marcia Ramos	2019-01-08	1	-6/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document how to run frontend tests Closes #53757 See merge request gitlab-org/gitlab-ce!24202
\| * \|	Document how to run frontend tests	Winnie Hellmann	2019-01-08	1	-6/+6
\|/ /
* \|	Merge branch 'mr-file-tree-blob-truncate-improvements' into 'master'	Filipa Lacerda	2019-01-08	14	-80/+223
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add headers to files in the tree list on merge requests Closes #54807 See merge request gitlab-org/gitlab-ce!23954
\| * \|	Add headers to files in the tree list on merge requests	Phil Hughes	2019-01-08	14	-80/+223
\| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54807
* \| \|	Merge branch ↵	Kushal Pandya	2019-01-08	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'8775-track-import-issues-csv-usage-on-gitlab-com-with-snowplow' into 'master' CE backport of "Track export issues CSV usage on GitLab.com with Snowplow" See merge request gitlab-org/gitlab-ce!24217
\| * \| \|	Backport of "Track export issues CSV usage on GitLab.com with Snowplow"	Constance Okoghenun	2019-01-08	1	-1/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9067
* \| \|	Merge branch 'remove-comma' into 'master'	Kushal Pandya	2019-01-08	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove comma from issuable email See merge request gitlab-org/gitlab-ce!24218
\| * \| \|	Remove comma from issuable email	Rajat Jain	2019-01-08	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch '56019-archived-stuck' into 'master'	Phil Hughes	2019-01-08	3	-4/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes z-index and margins of archived alert Closes #56019 See merge request gitlab-org/gitlab-ce!24193
\| * \| \| \|	Fixes z-index and margins of archived alert	Filipa Lacerda	2019-01-08	3	-4/+14
\| \|/ / /
* \| \| \|	Merge branch '55972-fix-commit-changes-wait-qa' into 'master'	Sanad Liaquat	2019-01-08	4	-2/+58
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wait for Web IDE commit animation Closes #55972 See merge request gitlab-org/gitlab-ce!24196
\| * \| \|	Wait for Web IDE commit animation	Mark Lapierre	2019-01-07	4	-2/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wait for the "Commit..." button to disappear and the "Stage & Commit" button to appear before clicking the latter button. The animation that is shown while changing the buttons must complete before clicking "Stage & Commit" will have any effect _even if_ the button is visible before the animation is complete.
* \| \| \|	Merge branch 'backstage/gb/improve-secpick-script' into 'master'	Rémy Coutable	2019-01-08	1	-63/+127
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve `bin/secpick` script and add more options See merge request gitlab-org/gitlab-ce!24117
\| * \| \| \|	Fix Rubocop offenses in bin/secpick scriptbackstage/gb/improve-secpick-script	Grzegorz Bizon	2019-01-07	1	-100/+105
\| \| \| \| \|
\| * \| \| \|	Show a valid new merge request URL in EE case	Grzegorz Bizon	2019-01-07	1	-3/+11
\| \| \| \| \|
\| * \| \| \|	Improve `bin/secpick` script and add more options	Grzegorz Bizon	2019-01-03	1	-29/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds additional options that make it easier to use this script: 1. It adds `--dry-run` option that only displays Git commands that are going to be executed. 2. It adds `--remote` option that makes it possible to override Git remote name.
* \| \| \| \|	Merge branch 'update-smooshpack' into 'master'	Filipa Lacerda	2019-01-08	3	-5/+10
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Codesandbox smooshpack library Closes #53779 See merge request gitlab-org/gitlab-ce!24191
\| * \| \| \|	Update Codesandbox smooshpack library	Phil Hughes	2019-01-07	3	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53779
* \| \| \| \|	Merge branch 'feature/custom-helm-chart-repo' into 'master'	Sean McGivern	2019-01-08	3	-2/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added feature to specify a custom Auto DevOps chart repository Closes #55791 See merge request gitlab-org/gitlab-ce!24162
\| * \| \| \| \|	Added AUTO_DEVOPS_CHART_REPOSITORY to env vars	Aaron Walker	2019-01-07	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Added feature to specify a custom Auto DevOps chart repository	walkafwalka	2019-01-04	3	-2/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'ce-1979-1-2-multi-block-approval-data-migration' into 'master'	Douwe Maan	2019-01-08	2	-0/+57
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check if specific type of background migration are done See merge request gitlab-org/gitlab-ce!24032
\| * \| \| \| \|	Check if specific type of background migration are done	Mark Chao	2019-01-08	2	-0/+57
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Useful for checking progress.
* \| \| \| \|	Merge branch '3845-committers-cannot-approve-mr-ce' into 'master'	Douwe Maan	2019-01-08	6	-10/+77
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add committers and authors methods on MergeRequest See merge request gitlab-org/gitlab-ce!24204
\| * \| \| \| \|	Add committers and authors methods on MergeRequest	Tiago Botelho	2019-01-08	6	-10/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are used by the EE-only approvers feature
* \| \| \| \| \|	Merge branch ↵	Evan Read	2019-01-08	2	-1/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'docs/52681-add-documentation-about-how-web-terminals-are-secured' into 'master' Add docs on how web terminals are secured Closes #52681 See merge request gitlab-org/gitlab-ce!24099
\| * \| \| \| \| \|	Add docs on how web terminals are secureddocs/52681-add-documentation-about-how-web-terminals-are-secured	Steve Azzopardi	2019-01-07	2	-1/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the administration page for web terminals add a new `Security` section explaining how the interactive web terminals are secured between GitLab and gitlab-runner. This section is under administration instead of `doc/ci/interactive_web_terminal` because the administrators of the GitLab instance would be mostly interested in this, whilst `doc/ci/interactive_web_terminal` are interested in how the feature works. closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52681
* \| \| \| \| \| \|	Merge branch 'ce-5606-issues-and-mr-autocomplete-in-epics' into 'master'	Robert Speicher	2019-01-08	2	-9/+51
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport of gitlab-ee!8936 See merge request gitlab-org/gitlab-ce!23976
\| * \| \| \| \| \| \|	CE backport for `reference` in gfm_autocompletece-5606-issues-and-mr-autocomplete-in-epics	Heinrich Lee Yu	2019-01-07	2	-9/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently not used by any CE code
* \| \| \| \| \| \| \|	Merge branch 'patch-37' into 'master'	Evan Read	2019-01-08	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link highlighting of jon.doe@example.com swallowed the trailing backtick, destroying formatting. See merge request gitlab-org/gitlab-ce!24133
\| * \| \| \| \| \| \| \|	Link highlighting of jon.doe@example.com swallowed the trailing backtick, ↵	Adam Smith	2019-01-08	1	-1/+1
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	destroying formatting.
* \| \| \| \| \| \| \|	Merge branch ↵	Mike Lewis	2019-01-08	5	-57/+95
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'29951-support-new-issue-creation-by-email-without-subaddressing-docs' into 'master' Document new incoming email address format See merge request gitlab-org/gitlab-ce!23991
\| * \| \| \| \| \| \| \|	Document new incoming email address format	Brett Walker	2019-01-08	5	-57/+95
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '53966-hashed-storage-read-only' into 'master'	Douglas Barbosa Alexandre	2019-01-08	6	-22/+114
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hashed Storage: Only set as `read_only` when starting the per-project migration See merge request gitlab-org/gitlab-ce!24128
\| * \| \| \| \| \| \| \|	Only set as `read_only` when starting the per-project migration53966-hashed-storage-read-only	Gabriel Mazetto	2019-01-07	6	-22/+114
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the previous code, we locked the project during the migration scheduling step, which works fine for small setups, but can be problematic in really big installations. We now moved the logic to inside the worker, so we minimize the time a project will be read-only. We also make sure we only do that if reference counter is `0` (no current operation is in progress).
* \| \| \| \| \| \| \| \|	Merge branch 'doc-merge_base' into 'master'	Evan Read	2019-01-07	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix doc for "Allow getting the merge base of multiple revisions" See merge request gitlab-org/gitlab-ce!24051
\| * \| \| \| \| \| \| \|	Fix doc for "Allow getting the merge base of multiple revisions"	Mathieu Parent	2018-12-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See 71d71afb3ac5f302470e66ace4f59e247249d99e
* \| \| \| \| \| \| \| \|	Merge branch '49231-import-issues-csv' into 'master'	Douwe Maan	2019-01-07	40	-31/+563
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Import issues from CSV Closes #49231 See merge request gitlab-org/gitlab-ce!23532
\| * \| \| \| \| \| \| \| \|	Remove caching of CSV file49231-import-issues-csv	Heinrich Lee Yu	2019-01-07	9	-31/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Load whole file in memory to simplify code
\| * \| \| \| \| \| \| \| \|	Improve email messages	Heinrich Lee Yu	2019-01-07	10	-31/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also refactored cleanup view to use the same localized string
\| * \| \| \| \| \| \| \| \|	Refactor upload service to return uploader	Heinrich Lee Yu	2019-01-07	7	-15/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also changes old calls to the service
\| * \| \| \| \| \| \| \| \|	Add CSV Import documentation	Heinrich Lee Yu	2019-01-07	4	-0/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document importing of CSVs with format information and sample data
\| * \| \| \| \| \| \| \| \|	Import CSV Backend	Heinrich Lee Yu	2019-01-07	21	-12/+381
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Process CSV uploads async using a worker then email results
\| * \| \| \| \| \| \| \| \|	Add Import CSV Frontend	Heinrich Lee Yu	2019-01-07	13	-53/+138
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added button and modal to accept CSV file for uploading
* \| \| \| \| \| \| \| \|	Merge branch 'fix-qa-auto-devops-before-all' into 'master'	Kamil Trzciński	2019-01-07	1	-26/+24
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix QA spec sharing project in the wrong context Closes gitlab-org/quality/nightly#54 See merge request gitlab-org/gitlab-ce!24183