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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove gitlab-ui's pagination from globalgl-ui-pagination	Clement Ho	2018-10-30	3	-2/+9
\|
*	Merge branch 'add-language-param-to-highlight' into 'master'	Douwe Maan	2018-10-30	28	-125/+289
\|\ \| \| \| \| \| \| \| \|	Add language param to highlight See merge request gitlab-org/gitlab-ce!21584
\| *	Allow search results to accept project_idadd-language-param-to-highlight	Mark Chao	2018-10-30	1	-1/+6
\| \| \| \| \| \| \| \|	This gives flexiblity to avoid duplicated query of Project.
\| *	Centralize loading blob data before highlighting	Mark Chao	2018-10-30	1	-0/+2
\| \|
\| *	Allow FoundBlob to access language from gitattributes	Mark Chao	2018-10-30	7	-31/+46
\| \| \| \| \| \| \| \| \| \|	Extract language_from_git_attributes as a concern so it can ben included in two blob classes.
\| *	Move :plain option to Highlight class	Mark Chao	2018-10-30	9	-88/+74
\| \| \| \| \| \| \| \| \| \| \| \|	This is to DRY the repeated file size check. Move spec and constants to Highlight
\| *	Make Highlight accept language param	Mark Chao	2018-10-30	16	-56/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This replaces the repository param. This allows more flexiblity as sometimes we have highlight content not related to repository. Sometimes we know ahead of time the language of the content. Lastly language determination seems better fit as a logic in the Blob class. `repository` param is only used to determine the language, which seems to be the responsiblity of Blob.
\| *	Add BlobPresenter for highlighting	Mark Chao	2018-10-30	4	-1/+82
\| \| \| \| \| \| \| \|	Force FoundBlob to use BlobPresenter
\| *	Add access to Blob's language from gitattributes	Mark Chao	2018-10-30	3	-0/+29
\| \| \| \| \| \| \| \| \| \|	Ported from Highlight class since it as a concept is more related to blob, and this allows more flexibility.
\| *	Add spec for Gitlab::Git::Repository#attributes	Mark Chao	2018-10-30	3	-7/+45
\| \| \| \| \| \| \| \| \| \|	seed_helper changed because testing requires attributes file in repo, but repo was not a real git repo but instead faked.
* \|	Merge branch 'bvl-move-wrapped-gitaly-errors' into 'master'	Douwe Maan	2018-10-30	10	-35/+76
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Move Repository#wrapped_gitaly_errors into concern See merge request gitlab-org/gitlab-ce!22691
\| * \|	Move Repository#wrapped_gitaly_errors into concern	Bob Van Landuyt	2018-10-30	10	-35/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Having this in a concern allows us to reuse it for different single purpose classes that call out to git without going through the repository every time.
* \| \|	Merge branch 'docs/fix-notifications-topic' into 'master'	Achilleas Pipinellis	2018-10-30	1	-18/+23
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix structure and add notification level See merge request gitlab-org/gitlab-ce!22528
\| * \| \|	Fix structure and add notification level	Evan Read	2018-10-30	1	-18/+23
\|/ / /
* \| \|	Merge branch 'frozen-string-enable-lib-gitlab-ci' into 'master'	Stan Hu	2018-10-30	90	-2/+188
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable some frozen string for lib/gitlab/ci See merge request gitlab-org/gitlab-ce!22636
\| * \| \|	Enable frozen string for lib/gitlab/ci	gfyoung	2018-10-26	90	-2/+188
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enables frozen string for the following: * lib/gitlab/ci/.rb lib/gitlab/ci/build/*/.rb * lib/gitlab/ci/config/*/.rb * lib/gitlab/ci/pipeline/*/.rb * lib/gitlab/ci/reports/*/.rb Partially addresses #47424.
* \| \| \|	Merge branch 'fix-app-layout-form-description' into 'master'	Clement Ho	2018-10-30	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix application layout form description See merge request gitlab-org/gitlab-ce!22658
\| * \| \| \|	Fix application layout form description	Andreas Kämmerle	2018-10-30	1	-2/+2
\|/ / / /
* \| \| \|	Merge branch '50962-create-new-group-rename-form-fields-and-update-ui' into ↵	Mike Greiling	2018-10-30	11	-57/+117
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Create new group: Rename form fields and update UI" Closes #50962 See merge request gitlab-org/gitlab-ce!22418
\| * \| \| \|	Resolve "Create new group: Rename form fields and update UI"	Martin Wortschack	2018-10-30	11	-57/+117
\|/ / / /
* \| \| \|	Merge branch 'sh-fix-search-relative-urls' into 'master'	Clement Ho	2018-10-30	2	-2/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix search "all in GitLab" not working with relative URLs Closes #53259 See merge request gitlab-org/gitlab-ce!22644
\| * \| \| \|	Fix search "all in GitLab" not working with relative URLssh-fix-search-relative-urls	Stan Hu	2018-10-28	2	-2/+7
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53259
* \| \| \|	Merge branch 'fl-missing-i18n' into 'master'	Mike Greiling	2018-10-30	7	-15/+38
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Adds missing i18n to pipelines table See merge request gitlab-org/gitlab-ce!22690
\| * \| \|	Adds missing i18n to pipelines tablefl-missing-i18n	Filipa Lacerda	2018-10-30	7	-15/+38
\| \| \| \|
* \| \| \|	Merge branch '53227-empty-list' into 'master'	Phil Hughes	2018-10-30	5	-24/+111
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Empty list for links to changed pages in Review App from MR Widget" Closes #53227 See merge request gitlab-org/gitlab-ce!22665
\| * \| \| \|	Runs prettier on changed files53227-empty-list	Filipa Lacerda	2018-10-30	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Prevents review app to render an empty dropdown.	Filipa Lacerda	2018-10-30	5	-24/+111
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a deployment has no files to show in the dropdown we fallback to the regular single button for the review app link. This commit moves the review app link into a component since it's used twice.
* \| \| \| \|	Merge branch 'tc-index-lfs-objects-file-store' into 'master'	Douglas Barbosa Alexandre	2018-10-30	5	-21/+25
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enhance performance of counting local LFS objects Closes gitlab-ee#6067 See merge request gitlab-org/gitlab-ce!22143
\| * \| \| \|	Enhance performance of counting local LFS objectstc-index-lfs-objects-file-store	Toon Claes	2018-10-30	5	-21/+25
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an index to the `file_store` column on `lfs_objects`. This makes counting local objects faster. Also, there is no longer need to check for objects with `file_store` being `NULL`. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18557 --- ### Query plans #### Before & with `NULL` ``` Aggregate (cost=113495.96..113495.97 rows=1 width=8) (actual time=1691.394..1691.394 rows=1 loops=1) -> Seq Scan on lfs_objects (cost=0.00..106415.50 rows=2832186 width=0) (actual time=0.012..1312.488 rows=2852607 loops=1) Filter: ((file_store = 1) OR (file_store IS NULL)) Rows Removed by Filter: 131 Planning time: 0.077 ms Execution time: 1691.433 ms ``` #### Before, without `NULL` ``` Aggregate (cost=113495.96..113495.97 rows=1 width=8) (actual time=856.423..856.424 rows=1 loops=1) -> Seq Scan on lfs_objects (cost=0.00..106415.50 rows=2832186 width=0) (actual time=0.012..672.181 rows=2852607 loops=1) Filter: (file_store = 1) Rows Removed by Filter: 131 Planning time: 0.128 ms Execution time: 856.470 ms ``` #### After & with `NULL` ``` Aggregate (cost=68819.95..68819.96 rows=1 width=8) (actual time=583.355..583.355 rows=1 loops=1) -> Index Only Scan using index_lfs_objects_on_file_store on lfs_objects (cost=0.43..61688.35 rows=2852643 width=0) (actual time=0.028..399.177 rows=2852607 loops=1) Filter: ((file_store = 1) OR (file_store IS NULL)) Rows Removed by Filter: 131 Heap Fetches: 867 Planning time: 0.096 ms Execution time: 583.404 ms ``` #### After, without `NULL` ``` Aggregate (cost=68817.29..68817.30 rows=1 width=8) (actual time=490.550..490.551 rows=1 loops=1) -> Index Only Scan using index_lfs_objects_on_file_store on lfs_objects (cost=0.43..61685.68 rows=2852643 width=0) (actual time=0.040..311.760 rows=2852607 loops=1) Index Cond: (file_store = 1) Heap Fetches: 831 Planning time: 0.294 ms Execution time: 490.590 ms ``` Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6067
* \| \| \|	Merge branch 'winh-pipeline-actions-dynamic-timer' into 'master'	Filipa Lacerda	2018-10-30	3	-8/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add dynamic timer for delayed jobs in pipelines list See merge request gitlab-org/gitlab-ce!22621
\| * \| \| \|	Add dynamic timer for delayed jobs in pipelines listwinh-pipeline-actions-dynamic-timer	Winnie Hellmann	2018-10-29	3	-8/+13
\| \| \| \| \|
* \| \| \| \|	Merge branch 'backport-ee-7203-sticky-logs-topbar' into 'master'	Filipa Lacerda	2018-10-30	3	-74/+100
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport ee 7203 sticky logs topbar See merge request gitlab-org/gitlab-ce!22282
\| * \| \| \| \|	Backport ee 7203 sticky logs topbar	Simon Knox	2018-10-30	3	-74/+100
\|/ / / / /
* \| \| \| \|	Merge branch 'mr-diff-discussion-deletion' into 'master'	Filipa Lacerda	2018-10-30	3	-8/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes diff discussions not being fully removed Closes #53317 See merge request gitlab-org/gitlab-ce!22680
\| * \| \| \| \|	Fixes diff discussions not being fully removedmr-diff-discussion-deletion	Phil Hughes	2018-10-30	3	-8/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes a bug where a discussion on a none changed line would not get fully removed and therefore leave the comment row empty. This was caused by the discussiob being added to the right when it shouldnt of been This also fixes a very rare edge case where discussions would get added twice to diff lines causing a Vue rendering warning Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53317
* \| \| \| \| \|	Merge branch 'sh-fix-issue-53153' into 'master'	Sean McGivern	2018-10-30	3	-1/+71
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix extra merge request versions created from forked merge requests Closes #53153 See merge request gitlab-org/gitlab-ce!22611
\| * \| \| \| \| \|	Fix extra merge request versions created from forked merge requestssh-fix-issue-53153	Stan Hu	2018-10-29	3	-1/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a forked merge request was created with the same branch name as the target name, MergeRequests::RefreshService would always create a new diff even though nothing had changed. For example, on GitLab.com: 1. There were a number of merge requests in the gitlab-ce and www-gitlab-com projects that had old merge requests from the community. 2. These merge requests originated from forked projects and used the source branch master. 3. When someone pushed to master in the main repository, MergeRequests::RefreshService would see that master matched the merge requests in question and generated a new diff. 4. This led to an explosion of merge request diffs and slowed down the "Changes" tab considerably. This change alters MergeRequests::RefreshService so that it will only refresh the diff if the merge request's source project and branch match. Otherwise, the refresh will only happen if a pushed commit contains a commit relevant to the existing merge request. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53153
* \| \| \| \| \| \|	Merge branch 'ml-qa-squash-fix' into 'master'	Sean McGivern	2018-10-30	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wait for push before checking for new commit Closes gitlab-org/quality/staging#14 See merge request gitlab-org/gitlab-ce!22633
\| * \| \| \| \| \| \|	Wait for push before checking for new commitml-qa-squash-fix	Mark Lapierre	2018-10-26	1	-0/+1
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wait for the push to be completed before checking that the merge request shows the change
* \| \| \| \| \| \|	Merge branch 'fix-53298' into 'master'	Dmitriy Zaporozhets	2018-10-30	2	-1/+6
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix #53298 JupyterHub restarts should work without errors Closes #53298 See merge request gitlab-org/gitlab-ce!22671
\| * \| \| \| \| \| \|	Adding changelog entry	Amit Rathi	2018-10-30	1	-0/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce	Amit Rathi	2018-10-30	26	-341/+301
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix #53298: JupyterHub to restarts should work without errors	Amit Rathi	2018-10-30	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'mlapierre-master-patch-47853' into 'master'	Marin Jankovski	2018-10-30	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Review Apps testing guide See merge request gitlab-org/gitlab-ce!22670
\| * \| \| \| \| \| \| \|	Fix Review Apps testing guidemlapierre-master-patch-47853	Mark Lapierre	2018-10-29	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes from docs review
* \| \| \| \| \| \| \| \|	Merge branch 'rename-secret-variables-1' into 'master'	Grzegorz Bizon	2018-10-30	25	-64/+69
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renaming Secret Variables in the codebase Closes #49629 See merge request gitlab-org/gitlab-ce!22414
\| * \| \| \| \| \| \| \| \|	Renaming Secret Variables in the codebase	Marcel Amirault	2018-10-30	25	-64/+69
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'qa-filter-comments-in-issues' into 'master'	Grzegorz Bizon	2018-10-30	3	-15/+55
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding tests for filtering activities/comments in issues Closes #51889 See merge request gitlab-org/gitlab-ce!22564
\| * \| \| \| \| \| \| \|	Adding tests for filtering activities/comments in issues	Ramya Authappan	2018-10-30	3	-15/+55
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into dev-master	Jan Provaznik	2018-10-30	23	-59/+66
\|\ \ \ \ \ \ \ \