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

	Commit message (Collapse)	Author	Age	Files	Lines
*	changeloggitaly-repo-exists	Jacob Vosmaer	2018-01-25	1	-0/+5
\|
*	Make Gitaly RepositoryExists opt-out	Jacob Vosmaer	2018-01-25	1	-1/+1
\|
*	Merge branch 'qa/gb/ci-cd-qa-pipelines' into 'master'	Rémy Coutable	2018-01-25	23	-93/+428
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	CI/CD end-to-end tests Closes gitlab-qa#18 See merge request gitlab-org/gitlab-ce!16619
\| *	Fix offense in runners settings QA page object classqa/gb/ci-cd-qa-pipelines	Grzegorz Bizon	2018-01-23	1	-1/+3
\| \|
\| *	Wait for runner until it registers itself in QA tests	Grzegorz Bizon	2018-01-23	1	-0/+1
\| \|
\| *	Fix static-analysis offenses in QA support class	Grzegorz Bizon	2018-01-23	1	-0/+4
\| \|
\| *	Add specific views / selectors for QA runners page	Grzegorz Bizon	2018-01-23	2	-4/+14
\| \|
\| *	Merge branch 'master' into qa/gb/ci-cd-qa-pipelines	Grzegorz Bizon	2018-01-23	281	-4449/+5509
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (69 commits) Conflicts: qa/qa.rb
\| * \|	Add views / selectors for pipeline show page object	Grzegorz Bizon	2018-01-23	1	-0/+12
\| \| \|
\| * \|	Assert on pipeline jobs statuses in CI/CD QA tests	Grzegorz Bizon	2018-01-23	5	-4/+75
\| \| \|
\| * \|	Remove blocking wait-time for runner to register in QA	Grzegorz Bizon	2018-01-23	1	-2/+0
\| \| \|
\| * \|	Use runner tags when processing CI/CD QA pipelines	Grzegorz Bizon	2018-01-23	2	-2/+16
\| \| \|
\| * \|	Refactor QA instance test scenario and tags	Grzegorz Bizon	2018-01-23	7	-46/+41
\| \| \|
\| * \|	Fix CI/CD end-to-end tests by waiting for changes	Grzegorz Bizon	2018-01-22	3	-5/+7
\| \| \|
\| * \|	Reduce nesting and simplify CI/CD end-to-end tests	Grzegorz Bizon	2018-01-22	4	-24/+56
\| \| \|
\| * \|	Wait for Runner to register in QA and DRY page objects	Grzegorz Bizon	2018-01-22	4	-10/+19
\| \| \|
\| * \|	Add end-to-end test for registering GitLab Runner	Grzegorz Bizon	2018-01-22	9	-16/+166
\| \| \|
\| * \|	Add GitLab Runner service to GitLab QA	Grzegorz Bizon	2018-01-22	5	-42/+77
\| \| \|
* \| \|	Merge branch ↵	Rémy Coutable	2018-01-25	5	-13/+17
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42053-link-to-clusters-in-auto-devops-instead-of-kubernetes-service' into 'master' Link Auto DevOps settings to Clusters page Closes #42053 See merge request gitlab-org/gitlab-ce!16641
\| * \| \|	Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service"	Fabio Busatto	2018-01-25	5	-13/+17
\|/ / /
* \| \|	Merge branch ↵	Rémy Coutable	2018-01-25	3	-2/+30
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit' into 'master' Resolve "Gitaly::CommitService: Encoding::UndefinedConversionError: U+C124 from UTF-8 to ASCII-8BIT" Closes #42161 See merge request gitlab-org/gitlab-ce!16637
\| * \| \|	Make sure we're passing ASCII-8BIT to Gitaly42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit	Lin Jen-Shin	2018-01-23	3	-2/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when counting commit count.
* \| \| \|	Merge branch 'fl-mr-widget-refactor' into 'master'	Phil Hughes	2018-01-25	11	-256/+267
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves more mr widget components into vue files See merge request gitlab-org/gitlab-ce!16677
\| * \| \| \|	Moves more mr widget components into vue filesfl-mr-widget-refactor	Filipa Lacerda	2018-01-24	11	-256/+267
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds i18n Adds better test coverage
* \| \| \| \|	Merge branch 'sh-add-gitaly-health-check' into 'master'	Robert Speicher	2018-01-25	8	-4/+220
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a gRPC health check to ensure Gitaly is up See merge request gitlab-org/gitlab-ce!16606
\| * \| \| \| \|	Add a gRPC health check to ensure Gitaly is upsh-add-gitaly-health-check	Stan Hu	2018-01-24	8	-4/+220
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will enable Geo to skip shards that not operational. Relates to gitlab-org/gitlab-ee#4329
* \| \| \| \| \|	Update CHANGELOG.md for 10.4.1	Robert Speicher	2018-01-24	7	-32/+15
\|/ / / / / \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	Merge branch '39917-revert-this-merge-request-text' into 'master'	Fatih Acet	2018-01-24	2	-0/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve ""Revert this merge request" modal has confusing string" Closes #39917 See merge request gitlab-org/gitlab-ce!16611
\| * \| \| \| \|	Updates `Revert this merge request` text	Jacopo	2018-01-24	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes the text in the Revert merge request modal: `Start a new merge request with these changes` => `Start a new merge request with the revert changes`.
* \| \| \| \| \|	Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master'	Robert Speicher	2018-01-24	2	-1/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add formatted_data attribute to Git::WikiPage Closes #39805 See merge request gitlab-org/gitlab-ce!16682
\| * \| \| \| \| \|	Add formatted_data attribute to Git::WikiPage	Ahmad Sherif	2018-01-24	2	-1/+13
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Related to #39805
* \| \| \| \| \|	Merge branch 'search-100' into 'master'	Yorick Peterse	2018-01-24	13	-31/+153
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use limit for search count queries See merge request gitlab-org/gitlab-ce!16502
\| * \| \| \| \| \|	Use limit for search count queriessearch-100	Jan Provaznik	2018-01-23	13	-31/+153
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Search query is especially slow if a user searches a generic string which matches many records, in such case search can take tens of seconds or time out. To speed up the search query, we search only for first 1000 records, if there is >1000 matching records we just display "1000+" instead of precise total count supposing that with such amount the exact count is not so important for the user. Because for issues even limited search was not fast enough, 2-phase approach is used for issues: first we use simpler/faster query to get all public issues, if this exceeds the limit, we just return the limit. If the amount of matching results is lower than limit, we re-run more complex search query (which includes also confidential issues). Re-running the complex query should be fast enough in such case because the amount of matching issues is lower than limit. Because exact total_count is now limited, this patch also switches to to "prev/next" pagination. Related #40540
* \| \| \| \| \| \|	Merge branch '40744-idempotent-ids' into 'master'	Robert Speicher	2018-01-24	29	-62/+86
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' Closes #30783 See merge request gitlab-org/gitlab-ce!16516
\| * \| \| \| \| \| \|	Avoid array indices to fixtures in JS specs	Nick Thomas	2018-01-24	3	-8/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL	Nick Thomas	2018-01-24	1	-0/+15
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'	Nick Thomas	2018-01-24	29	-63/+69
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'feature/migrate-get-lfs-ptrs-to-gitaly' into 'master'	Robert Speicher	2018-01-24	4	-22/+67
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate .batch_lfs_pointers to Gitaly Closes gitaly#921 See merge request gitlab-org/gitlab-ce!16517
\| * \| \| \| \| \| \| \|	Migrate .batch_lfs_pointers to Gitalyfeature/migrate-get-lfs-ptrs-to-gitaly	Ahmad Sherif	2018-01-24	4	-22/+67
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#921
* \| \| \| \| \| \| \|	Merge branch 'dm-project-system-hooks-in-transaction' into 'master'	Robert Speicher	2018-01-24	4	-3/+27
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Execute system hooks after-commit when executing project hooks See merge request gitlab-org/gitlab-ce!16673
\| * \| \| \| \| \| \|	Execute system hooks after-commit when executing project hooksdm-project-system-hooks-in-transaction	Douwe Maan	2018-01-24	4	-3/+27
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '42361-workaround' into 'master'alejandro-test	Robert Speicher	2018-01-24	1	-0/+3
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Spec failure in ./spec/features/issues/spam_issues_spec.rb" Closes #42361 See merge request gitlab-org/gitlab-ce!16671
\| * \| \| \| \| \| \|	Workaround a recaptcha pop-up that cannot be tested	Rémy Coutable	2018-01-24	1	-0/+3
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'rc/move-one-spinach-job-to-rspec' into 'master'	Robert Speicher	2018-01-24	1	-63/+63
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove one Spinach job and add one RSpec job See merge request gitlab-org/gitlab-ce!16675
\| * \| \| \| \| \| \|	Remove one Spinach job and add one RSpec jobrc/move-one-spinach-job-to-rspec	Rémy Coutable	2018-01-24	1	-63/+63
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \|	Merge branch 'feature/migrate-bundle-to-disk-to-gitaly' into 'master'	Robert Speicher	2018-01-24	10	-10/+64
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate repository bundling to Gitaly Closes gitaly#929 See merge request gitlab-org/gitlab-ce!16563
\| * \| \| \| \| \| \|	Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitaly	Ahmad Sherif	2018-01-24	10	-10/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#929
* \| \| \| \| \| \| \|	Merge branch 'patch-28' into 'master'	Robert Speicher	2018-01-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in `.gitlab-ci.yml` heading See merge request gitlab-org/gitlab-ce!16668
\| * \| \| \| \| \| \| \|	Fix typo in `.gitlab-ci.yml` heading	Mathijs de Kruyf	2018-01-24	1	-1/+1
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'	Douwe Maan	2018-01-24	2	-1/+15
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return more consistent values for merge_status on V4 MR APIs Closes #20639 See merge request gitlab-org/gitlab-ce!16626