summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refactor the backup/restore docsdocs/refactor-backupAchilleas Pipinellis2018-10-301-91/+224
| | | | | | - Rearrange sections - Stress out the importance of storing config files - Add troubleshooting guide in case secrets is lost
* Merge branch 'frozen-string-enable-lib-gitlab-ci' into 'master'Stan Hu2018-10-3090-2/+188
|\ | | | | | | | | Enable some frozen string for lib/gitlab/ci See merge request gitlab-org/gitlab-ce!22636
| * Enable frozen string for lib/gitlab/cigfyoung2018-10-2690-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 Ho2018-10-301-2/+2
|\ \ | | | | | | | | | | | | Fix application layout form description See merge request gitlab-org/gitlab-ce!22658
| * | Fix application layout form descriptionAndreas Kämmerle2018-10-301-2/+2
|/ /
* | Merge branch '50962-create-new-group-rename-form-fields-and-update-ui' into ↵Mike Greiling2018-10-3011-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 Wortschack2018-10-3011-57/+117
|/ /
* | Merge branch 'sh-fix-search-relative-urls' into 'master'Clement Ho2018-10-302-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-urlsStan Hu2018-10-282-2/+7
| |/ | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53259
* | Merge branch 'fl-missing-i18n' into 'master'Mike Greiling2018-10-307-15/+38
|\ \ | | | | | | | | | | | | Adds missing i18n to pipelines table See merge request gitlab-org/gitlab-ce!22690
| * | Adds missing i18n to pipelines tablefl-missing-i18nFilipa Lacerda2018-10-307-15/+38
| | |
* | | Merge branch '53227-empty-list' into 'master'Phil Hughes2018-10-305-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-listFilipa Lacerda2018-10-301-1/+1
| | | |
| * | | Prevents review app to render an empty dropdown.Filipa Lacerda2018-10-305-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 Alexandre2018-10-305-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-storeToon Claes2018-10-305-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 Lacerda2018-10-303-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-timerWinnie Hellmann2018-10-293-8/+13
| | | | |
* | | | | Merge branch 'backport-ee-7203-sticky-logs-topbar' into 'master'Filipa Lacerda2018-10-303-74/+100
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport ee 7203 sticky logs topbar See merge request gitlab-org/gitlab-ce!22282
| * | | | | Backport ee 7203 sticky logs topbarSimon Knox2018-10-303-74/+100
|/ / / / /
* | | | | Merge branch 'mr-diff-discussion-deletion' into 'master'Filipa Lacerda2018-10-303-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-deletionPhil Hughes2018-10-303-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 McGivern2018-10-303-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-53153Stan Hu2018-10-293-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 McGivern2018-10-301-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-fixMark Lapierre2018-10-261-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 Zaporozhets2018-10-302-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #53298 JupyterHub restarts should work without errors Closes #53298 See merge request gitlab-org/gitlab-ce!22671
| * | | | | | | Adding changelog entryAmit Rathi2018-10-301-0/+5
| | | | | | | |
| * | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceAmit Rathi2018-10-3026-341/+301
| |\ \ \ \ \ \ \
| * | | | | | | | Fix #53298: JupyterHub to restarts should work without errorsAmit Rathi2018-10-301-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'mlapierre-master-patch-47853' into 'master'Marin Jankovski2018-10-301-3/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix Review Apps testing guide See merge request gitlab-org/gitlab-ce!22670
| * | | | | | | | Fix Review Apps testing guidemlapierre-master-patch-47853Mark Lapierre2018-10-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changes from docs review
* | | | | | | | | Merge branch 'rename-secret-variables-1' into 'master'Grzegorz Bizon2018-10-3025-64/+69
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming Secret Variables in the codebase Closes #49629 See merge request gitlab-org/gitlab-ce!22414
| * | | | | | | | | Renaming Secret Variables in the codebaseMarcel Amirault2018-10-3025-64/+69
|/ / / / / / / / /
* | | | | | | | | Merge branch 'qa-filter-comments-in-issues' into 'master'Grzegorz Bizon2018-10-303-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 issuesRamya Authappan2018-10-303-15/+55
|/ / / / / / / /
* | | | | | | | Merge remote-tracking branch 'origin/master' into dev-masterJan Provaznik2018-10-3023-59/+66
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'bw-fix-spec-in-merge' into 'master'Stan Hu2018-10-301-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 mergeBrett Walker2018-10-291-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'docs-add_deprecation_notice_for_renamed_licensed_feature-ce' ↵Evan Read2018-10-301-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-ceOlivier Gonzalez2018-10-241-0/+6
| | | | | | | | | |
| * | | | | | | | | Merge branch 'patch-31' into 'master'Evan Read2018-10-301-0/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a note about machine types See merge request gitlab-org/gitlab-ce!22572
| | * | | | | | | | | Added a note about machine typesMark Veenstra2018-10-301-0/+3
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'update-gitlab-ui' into 'master'Mike Greiling2018-10-2916-51/+51
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update gitlab-ui to 1.9.0 See merge request gitlab-org/gitlab-ce!22632
| | * | | | | | | | | Update gitlab-ui to 1.9.0Clement Ho2018-10-2916-51/+51
| |/ / / / / / / / /
| * | | | | | | | | Merge branch '53270-remove-mousetrap-rails' into 'master'Mike Greiling2018-10-294-7/+5
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove mousetrap-rails gem Closes #53270 See merge request gitlab-org/gitlab-ce!22647
| | * | | | | | | | | Remove mousetrap-rails gemTakuya Noguchi2018-10-284-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-29406-3204/+6889
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'Douwe Maan2018-10-2925-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-urlblackst0ne2018-10-271-1/+0
| | | | | | | | | | |
View Lorry Controller Status