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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add e2e test of push over SSH over Git protocol v2ml-qa-git-protocol-v2-spec	Mark Lapierre	2018-11-07	7	-13/+211
\| \| \| \| \| \| \| \|	Adds a new end-to-end test to check that Git protocol v2 can be used to push over SSH. Includes a change in Git::Repository to use Runtime::Env.debug? to enable logging instead of .verbose?
*	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
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'bw-fix-spec-in-merge' into 'master'	Stan Hu	2018-10-30	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix problem with spec that showed up in EE merge See merge request gitlab-org/gitlab-ce!22675
\| \| * \| \| \| \| \| \| \|	Fix problem with spec that showed up in EE merge	Brett Walker	2018-10-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'docs-add_deprecation_notice_for_renamed_licensed_feature-ce' ↵	Evan Read	2018-10-30	1	-0/+6
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' docs: Add deprecation notice for renamed licensed feature See merge request gitlab-org/gitlab-ce!22575
\| \| * \| \| \| \| \| \| \|	Add deprecation notice for renamed licensed featuredocs-add_deprecation_notice_for_renamed_licensed_feature-ce	Olivier Gonzalez	2018-10-24	1	-0/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'patch-31' into 'master'	Evan Read	2018-10-30	1	-0/+3
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a note about machine types See merge request gitlab-org/gitlab-ce!22572
\| \| * \| \| \| \| \| \| \| \|	Added a note about machine types	Mark Veenstra	2018-10-30	1	-0/+3
\| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge branch 'update-gitlab-ui' into 'master'	Mike Greiling	2018-10-29	16	-51/+51
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab-ui to 1.9.0 See merge request gitlab-org/gitlab-ce!22632
\| \| * \| \| \| \| \| \| \| \|	Update gitlab-ui to 1.9.0	Clement Ho	2018-10-29	16	-51/+51
\| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge branch '53270-remove-mousetrap-rails' into 'master'	Mike Greiling	2018-10-29	4	-7/+5
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove mousetrap-rails gem Closes #53270 See merge request gitlab-org/gitlab-ce!22647
\| \| * \| \| \| \| \| \| \| \|	Remove mousetrap-rails gem	Takuya Noguchi	2018-10-28	4	-7/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into dev-master	DJ Mountney	2018-10-29	406	-3204/+6889
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'	Douwe Maan	2018-10-29	25	-47/+55
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make new merge request URL more friendly when pushing code Closes #53012 See merge request gitlab-org/gitlab-ce!22526
\| \| * \| \| \| \| \| \| \| \|	Revert _diffs.html.hamlblackst0ne-update-push-new-merge-request-url	blackst0ne	2018-10-27	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Fix specs	blackst0ne	2018-10-26	8	-16/+17
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Update other links	blackst0ne	2018-10-26	14	-23/+25
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Make new merge request URL more friendly when pushing code	blackst0ne	2018-10-23	6	-9/+15
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'ml-qa-push-private-token' into 'master'	Dan Davison	2018-10-29	2	-1/+33
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add e2e test to push using a private token See merge request gitlab-org/gitlab-ce!22628
\| \| * \| \| \| \| \| \| \| \|	Add e2e test to push using a private tokenml-qa-push-private-token	Mark Lapierre	2018-10-29	2	-1/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tests pushing over HTTP(S) using a personal access token
\| * \| \| \| \| \| \| \| \| \|	Merge branch '53273-update-moment-to-2-22-2' into 'master'	Mike Greiling	2018-10-29	2	-6/+6
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update moment to 2.22.2 Closes #53273 See merge request gitlab-org/gitlab-ce!22648
\| \| * \| \| \| \| \| \| \| \|	Update moment to 2.22.2	Takuya Noguchi	2018-10-28	2	-6/+6
\| \| \| \|_\|/ / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
\| * \| \| \| \| \| \| \| \|	Merge branch 'pages-1-3-0' into 'master'	Robert Speicher	2018-10-29	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GitLab Pages to v1.3.0 See merge request gitlab-org/gitlab-ce!22666
\| \| * \| \| \| \| \| \| \| \|	Update GitLab Pages to v1.3.0	Nick Thomas	2018-10-29	1	-1/+1
\| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'rails5-deprecated-uniq' into 'master'	Robert Speicher	2018-10-29	6	-6/+11
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace deprecated uniq on a Relation with distinct See merge request gitlab-org/gitlab-ce!22625