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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert persisting file_format in databaseextend-junit-keyword-ce	Shinya Maeda	2018-07-04	5	-21/+3
\|
*	Revert the presenter of junit.xml	Shinya Maeda	2018-07-04	3	-27/+3
\|
*	Merge branch 'master' into extend-junit-keyword-ce	Shinya Maeda	2018-07-04	100	-1061/+889
\|\
\| *	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
\| \| * \| \| \| \|	DRY group creation code in nested groups fixtures	Dmitriy Zaporozhets	2018-07-02	1	-26/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Merge branch 'docs/run-review-only-for-gitlab-org-repos' into 'master'	Rémy Coutable	2018-07-03	1	-1/+4
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Run the review-docs jobs for gitlab-org repos only See merge request gitlab-org/gitlab-ce!20327
\| \| * \| \| \| \| \|	Run the review-docs jobs for gitlab-org repos only	Achilleas Pipinellis	2018-07-03	1	-1/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'update-template-name-via-sentence-case-research' into 'master'	🚄 Job van der Voort 🚀	2018-07-03	1	-0/+0
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update template name via sentence case (research) See merge request gitlab-org/gitlab-ce!19327
\| \| * \| \| \| \| \| \|	Update template name via sentence caseupdate-template-name-via-sentence-case-research	Andreas Kämmerle	2018-06-01	1	-0/+0
\| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'update-template-name-via-sentence-case-secutiry' into 'master'	🚄 Job van der Voort 🚀	2018-07-03	1	-0/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update template name via sentence case (security) See merge request gitlab-org/gitlab-ce!19328
\| \| * \| \| \| \| \| \|	Update template name via sentence case (security)update-template-name-via-sentence-case-secutiry	Andreas Kämmerle	2018-06-01	1	-0/+1
\| \| \|/ / / / / /
\| * \| \| \| \| \| \|	Merge branch 'update-template-name-via-sentence-case-db-changes' into 'master'	🚄 Job van der Voort 🚀	2018-07-03	1	-2/+2
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update template name via sentence case (database changes) See merge request gitlab-org/gitlab-ce!19329
\| \| * \| \| \| \| \| \|	Update template name via sentence case (database changes)update-template-name-via-sentence-case-db-changes	Andreas Kämmerle	2018-06-01	1	-2/+2
\| \| \|/ / / / / /
\| * \| \| \| \| \| \|	Merge branch '46963-add_readme_button_for_non_empty_project' into 'master'	Nick Thomas	2018-07-03	3	-3/+67
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add readme button to non-empty project page Closes #46963 See merge request gitlab-org/gitlab-ce!20104
\| \| * \| \| \| \| \| \|	Add readme button to non-empty project page	Imre Farkas	2018-07-03	3	-3/+67
\| \|/ / / / / / /
\| * \| \| \| \| \| \|	Merge branch 'temporarily-remove-mr-diffs-migration' into 'master'	Alessio Caiazza	2018-07-03	3	-119/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Temporarily remove MR diffs removal migration See merge request gitlab-org/gitlab-ce!20330
\| \| * \| \| \| \| \| \|	Temporarily remove MR diffs removal migration	Sean McGivern	2018-07-03	3	-119/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We will re-add this with a more efficient bulk scheduling method.
\| * \| \| \| \| \| \| \|	Merge branch 'sh-backport-repository-partial-index' into 'master'	Nick Thomas	2018-07-03	2	-1/+20
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport partial index to find repositories that have not been checked See merge request gitlab-org/gitlab-ce!20319
\| \| * \| \| \| \| \| \| \|	Backport partial index to find repositories that have not been checked	Stan Hu	2018-07-02	2	-1/+20
\| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was introduced in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5984.
\| * \| \| \| \| \| \| \|	Merge branch '36907-fix-new-issue-link-from-failed-job' into 'master'	Grzegorz Bizon	2018-07-03	3	-2/+7
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "New issue from failed build no longer links to failed build" Closes #36907 See merge request gitlab-org/gitlab-ce!20328
\| \| * \| \| \| \| \| \|	Fix link to job when creating a new issue from a failed job	Rémy Coutable	2018-07-03	3	-2/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \|	Merge branch 'docs/bamboo' into 'master'	Marcia Ramos	2018-07-03	1	-1/+5
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Copyedit Bamboo integration docs See merge request gitlab-org/gitlab-ce!20312
\| \| * \| \| \| \| \| \| \|	Copyedit Bamboo integration docs	Achilleas Pipinellis	2018-07-02	1	-1/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-bamboo-change-set' into 'master'	Rémy Coutable	2018-07-03	3	-12/+37
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Bamboo CI status not showing for branch plans Closes #1355 See merge request gitlab-org/gitlab-ce!20277
\| \| * \| \| \| \| \| \| \| \|	Fix Bamboo CI status not showing for branch plans	Stan Hu	2018-06-29	3	-12/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The original API that queries by label (`/rest/api/latest/result?label=#{sha1}`) only works for results from main plans and not branch plans. The `/rest/api/latest/result/byChangeset/#{sha1}` endpoint gives results from branch plans but not for the first push to the branch. Subsequent pushes work. For more details, see https://jira.atlassian.com/browse/BAM-16121. Closes #1355
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'gitaly-mandatory-20180702-jv' into 'master'	Douwe Maan	2018-07-03	9	-596/+162
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make OperationService RPC's mandatory Closes gitaly#801, gitaly#779, gitaly#755, gitaly#754, gitaly#727, gitaly#680, gitaly#633, gitaly#547, gitaly#546, and gitaly#541 See merge request gitlab-org/gitlab-ce!20309