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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master-i18n' into 'master'	Douwe Maan	2018-07-04	21	-20327/+36735
\| \| \| \| \|	New Crowdin translations See merge request gitlab-org/gitlab-ee!6299
*	Merge branch 'bump-carrierwave-to-1-2-3' into 'master'	Kamil Trzciński (OoO till 3th)	2018-07-04	3	-70/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Bump Carrierwave gem to 1.2.3 (which contains the monkey patch for memory consumption) Closes #46182 See merge request gitlab-org/gitlab-ce!20287
\| *	Add merge request number to changelog	Shinya Maeda	2018-07-04	1	-1/+1
\| \|
\| *	Delete monkey patch	Shinya Maeda	2018-07-04	1	-69/+0
\| \|
\| *	Bump carrierwave gem version to 1.2.3	Shinya Maeda	2018-07-04	2	-1/+6
\| \|
* \|	Merge branch 'bvl-graphql-pipeline-lists' into 'master'	Douwe Maan	2018-07-04	32	-15/+655
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add pipeline lists to graphql Closes #48469 See merge request gitlab-org/gitlab-ce!20249
\| * \|	Add pipeline lists to GraphQL	Bob Van Landuyt	2018-07-04	32	-15/+655
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds Keyset pagination to GraphQL lists. PoC for that is pipelines on merge requests and projects. When paginating a list, the base-64 encoded id of the ordering field (in most cases the primary key) can be passed in the `before` or `after` GraphQL argument.
* \| \|	Merge branch 'qa-112-prefer-env-credentials-for-gcloud' into 'master'	Grzegorz Bizon	2018-07-04	2	-3/+11
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Auto DevOps QA: Prefer gcloud credentials from env See merge request gitlab-org/gitlab-ce!20338
\| * \| \|	Auto DevOps QA: Prefer gcloud credentials from env	Dylan Griffith	2018-07-03	2	-3/+11
\| \| \| \|
* \| \| \|	Merge branch '47040-inconsistent-job-list-in-job-details-view' into 'master'	Kamil Trzciński (OoO till 3th)	2018-07-04	3	-4/+16
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Inconsistent job list in job details view" Closes #47040 See merge request gitlab-org/gitlab-ce!20243
\| * \| \| \|	Add CHANGELOG	Matija Čupić	2018-06-29	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	Check for correct builds collection	Matija Čupić	2018-06-29	1	-0/+9
\| \| \| \| \|
\| * \| \| \|	Use associated build pipeline	Matija Čupić	2018-06-29	1	-4/+2
\| \| \| \| \|
* \| \| \| \|	Merge branch 'patch-28' into 'master'	Rémy Coutable	2018-07-04	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo and formatting See merge request gitlab-org/gitlab-ce!20352
\| * \| \| \| \|	Fix typo and formatting	Steve Wills	2018-07-04	1	-2/+2
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'patch-28' into 'master'	Rémy Coutable	2018-07-04	1	-34/+34
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New jobs sorting See merge request gitlab-org/gitlab-ce!20337
\| * \| \| \| \|	New jobs sorting	Élie	2018-07-03	1	-34/+34
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'pravi/gitlab-ce-update-html-pipeline' into 'master'	Douwe Maan	2018-07-04	4	-17/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update html-pipeline 2.7.1 -> 2.8 Closes #48571 See merge request gitlab-org/gitlab-ce!20348
\| * \| \| \| \| \|	Use strong_memoize to customize the SanitizationFilter whitelist	Robert Speicher	2018-07-03	1	-12/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I never liked the hacky `customized?` method anyway, so this is cleaner.
\| * \| \| \| \| \|	dup whitelist before modification	Pirate Praveen	2018-06-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes ActionView::Template::Error (can't modify frozen Hash) #48415
\| * \| \| \| \| \|	update html-pipeline 2.7.1 -> 2.8	Pirate Praveen	2018-06-30	3	-5/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'gitaly-mandatory-20180703-jv' into 'master'	Douwe Maan	2018-07-04	5	-123/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make more Gitaly features mandatory Closes gitaly#949, gitaly#911, gitaly#820, gitaly#514, gitaly#551, gitaly#321, and gitaly#565 See merge request gitlab-org/gitlab-ce!20339
\| * \| \| \| \| \| \|	Make more Gitaly features mandatory	Jacob Vosmaer (GitLab)	2018-07-04	5	-123/+8
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'rs-git-rake-spec-speed' into 'master'	Rémy Coutable	2018-07-04	1	-6/+11
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up spec/tasks/gitlab/git_rake_spec.rb See merge request gitlab-org/gitlab-ce!20349
\| * \| \| \| \| \|	Speed up spec/tasks/gitlab/git_rake_spec.rb	Robert Speicher	2018-07-03	1	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because no Git repository was actually created at the temporary path we were using, `git fsck` would traverse up until it found a repository, which in our case was the CE or EE repository.
* \| \| \| \| \| \|	Merge branch '_acet-fix-parallel-diff-lines' into 'master'	Clement Ho	2018-07-04	2	-2/+12
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix content of the parallel diff lines Closes #48797 See merge request gitlab-org/gitlab-ce!20350
\| * \| \| \| \| \| \|	Fix parallel diff lines content.	Fatih Acet	2018-07-04	2	-2/+12
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '_acet-mr-diff-performance' into 'master'	Clement Ho	2018-07-03	10	-151/+194
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve performance of toggling diff view type Closes #48666 and #48733 See merge request gitlab-org/gitlab-ce!20278
\| * \| \| \| \| \|	Improve performance of toggling diff view type	Fatih Acet	2018-07-03	10	-151/+194
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'sh-add-captcha-prometheus-counters' into 'master'	Robert Speicher	2018-07-03	3	-1/+34
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Prometheus metrics to track reCAPTCHA success/failures See merge request gitlab-org/gitlab-ce!20086
\| * \| \| \| \| \|	Add Prometheus metrics to track reCAPTCHA success/failures	Stan Hu	2018-07-03	3	-1/+34
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-fix-move-issue-with-object-storage' into 'master'	Robert Speicher	2018-07-03	5	-42/+121
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement file copy for object storage when moving an issue Closes #48505 See merge request gitlab-org/gitlab-ce!20191
\| * \| \| \| \|	Fix minor spec review comments in uploader specs	Stan Hu	2018-07-03	2	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	fix the changelog	Micaël Bergeron	2018-07-03	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	fix an issue with local files	Micaël Bergeron	2018-07-03	2	-25/+8
\| \| \| \| \| \|
\| * \| \| \| \|	add support for file copy on object storage	Micaël Bergeron	2018-07-03	4	-44/+116
\| \| \| \| \| \|
\| * \| \| \| \|	When moving issues, don't attempt to move files in object storage	Stan Hu	2018-07-03	3	-1/+25
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #48505
* \| \| \| \|	Merge branch '48243-fix-deploy-key-scenario-qa' into 'master'	Robert Speicher	2018-07-03	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "QA: Deploy key cloning test sometimes can't find the QA element" Closes #48243 See merge request gitlab-org/gitlab-ce!20342
\| * \| \| \| \|	[QA] Wait for CSS class to be present instead of trying to find the element	Rémy Coutable	2018-07-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'web-hooks-log-pagination' into 'master'	Douwe Maan	2018-07-03	7	-4/+59
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed pagination of web hook logs See merge request gitlab-org/gitlab-ce!20247
\| * \ \ \ \ \	Merge branch 'master' into 'web-hooks-log-pagination'	Douwe Maan	2018-07-03	105	-998/+719
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \| \|	Fixed pagination of web hook logs	Yorick Peterse	2018-07-03	7	-5/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For reasons unknown, the logs of a web hook were paginated in memory. This would result in the "Edit" page of a web hook timing out once it has more than a few thousand log entries. This commit makes the following changes: 1. We use LIMIT/OFFSET to paginate the data, instead of doing this in memory. 2. We limit the logs to the last two days, just like the documentation says (instead of retrieving everything). 3. We change the indexes on "web_hook_logs" so the query to get the data can perform a backwards index scan, without the need for a Filter. These changes combined ensure that Projects::HooksController#edit no longer times out.
* \| \| \| \| \| \| \|	Merge branch '48634-header-navbar-line-seperator-is-missing' into 'master'	Annabel Gray	2018-07-03	3	-3/+6
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "The header navbar line separator is missing" Closes #48634 See merge request gitlab-org/gitlab-ce!20282
\| * \| \| \| \| \| \|	Brought back the line separator to the left of the 'Admin area' wrench icon ↵	Rahul C	2018-06-30	3	-3/+6
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	that had vanished
* \| \| \| \| \| \|	Merge branch '44994-osw-use-monospaced-font-on-diffs-commit-ref' into 'master'	Robert Speicher	2018-07-03	4	-3/+22
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Render SHA in merge request commit reference with mono spaced font" Closes #44994 See merge request gitlab-org/gitlab-ce!20228
\| * \| \| \| \| \|	Use monospaced font for MR diff commit link ref on GFM	Oswaldo Ferreira	2018-06-27	4	-3/+22
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'update-template-name-via-sentence-case' into 'master'	🚄 Job van der Voort 🚀	2018-07-03	1	-0/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update template name via sentence case (feature) See merge request gitlab-org/gitlab-ce!19326
\| * \ \ \ \ \ \	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵	Andreas Kämmerle	2018-07-03	2802	-21855/+47711
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update-template-name-via-sentence-case # Conflicts: # .gitlab/issue_templates/Feature proposal.md
\| * \| \| \| \| \| \|	Update template name via sentence caseupdate-template-name-via-sentence-case	Andreas Kämmerle	2018-06-01	1	-0/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'dz-dry-nested-group-fixtures' into 'master'	Dmitriy Zaporozhets	2018-07-03	1	-26/+2
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DRY group creation code in nested groups fixtures See merge request gitlab-org/gitlab-ce!20314