summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '52382-filter-milestone-api-none-any' into 'master'Sean McGivern2018-11-012-4/+16
|\ | | | | | | | | | | | | Resolve "Filter by `None`/`Any` for milestone in issues/mrs API" Closes #52382 See merge request gitlab-org/gitlab-ce!22637
| * Update API to accept None and AnyHeinrich Lee Yu2018-11-012-4/+16
| |
* | Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis2018-11-0162-85/+85
|\ \ | | | | | | | | | | | | Fix typos in comments and specs See merge request gitlab-org/gitlab-ce!22683
| * | Fix typos in comments and specsGeorge Tsiolis2018-11-0162-85/+85
| | |
* | | Merge branch 'sh-optimize-merge-request-project-lookup' into 'master'Sean McGivern2018-11-012-0/+18
|\ \ \ | |_|/ |/| | | | | | | | Reduce SQL queries needed to load open merge requests See merge request gitlab-org/gitlab-ce!22709
| * | Reduce SQL queries needed to load open merge requestssh-optimize-merge-request-project-lookupStan Hu2018-10-302-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | The SQL queries and memory allocation in MergeRequests::RefreshService is dominated by queries for Project and Route loads. On staging, the absence of an inverse relationship caused Rails to make over 1100 extraneous SQL queries for the www-gitlab-com repository. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49703
* | | Merge branch 'prettify-all-remaining-things' into 'master'Filipa Lacerda2018-10-3123-497/+493
|\ \ \ | | | | | | | | | | | | | | | | Prettify remaining files with differences in CE and EE See merge request gitlab-org/gitlab-ce!22702
| * | | Fix eslint violationsMike Greiling2018-10-312-0/+6
| | | |
| * | | Prettify remaining files with differences in CE and EEMike Greiling2018-10-3123-497/+487
| | | |
* | | | Merge branch 'gt-fix-quick-links-button-styles' into 'master'Annabel Dunstone Gray2018-10-311-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix quick links button styles Closes #52220 and #52063 See merge request gitlab-org/gitlab-ce!22657
| * | | | Fix quick links button stylesGeorge Tsiolis2018-10-291-1/+1
| | | | |
* | | | | Merge branch '53335-cancel-job-redirects-to-job-page' into 'master'Grzegorz Bizon2018-10-312-11/+41
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Send continue parameter on for `cancel_path` Closes #53335 See merge request gitlab-org/gitlab-ce!22712
| * | | | Use array syntax instead of dig for consistencySteve Azzopardi2018-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | We are using hash[symbol][symbol] everywhere else in the test file.
| * | | | Send continue parameter on for cancel_pathSteve Azzopardi2018-10-312-10/+40
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21595 `ContinueParams` was introducted in the `Projects::JobController#cancel` since `continue` parameter is not present for in `cancel_path` for `Projects::JobController#show.sjon` the user is being redirect to the pipeline page, where it should be redirected to the current job page instead. Add the `continue` parameter as a query string for `cancel_path`.
* | | | Merge branch ↵Filipa Lacerda2018-10-314-4/+14
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '41545-gitlab-merge-request-status-could-not-connect-to-the-ci-server-please-check-your-settings-and-try-again' into 'master' Resolve "Reword error message for internal CI unknown pipeline status" Closes #53056 See merge request gitlab-org/gitlab-ce!22474
| * | | Fix rspec error text regexMatija Čupić2018-10-242-3/+3
| | | |
| * | | Regenerates pot filesFilipa Lacerda2018-10-243-2/+12
| | | | | | | | | | | | | | | | Makes documentation path a required prop
| * | | Change CI status error messageMatija Čupić2018-10-243-3/+3
| | | |
* | | | Merge branch 'add-language-param-to-highlight' into 'master'Douwe Maan2018-10-309-83/+183
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add language param to highlight See merge request gitlab-org/gitlab-ce!21584
| * | | | Allow FoundBlob to access language from gitattributesMark Chao2018-10-303-17/+26
| | | | | | | | | | | | | | | | | | | | | | | | | Extract language_from_git_attributes as a concern so it can ben included in two blob classes.
| * | | | Move :plain option to Highlight classMark Chao2018-10-303-75/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to DRY the repeated file size check. Move spec and constants to Highlight
| * | | | Make Highlight accept language paramMark Chao2018-10-302-25/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 highlightingMark Chao2018-10-301-0/+60
| | | | | | | | | | | | | | | | | | | | Force FoundBlob to use BlobPresenter
| * | | | Add access to Blob's language from gitattributesMark Chao2018-10-301-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | 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#attributesMark Chao2018-10-303-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 Maan2018-10-301-0/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move Repository#wrapped_gitaly_errors into concern See merge request gitlab-org/gitlab-ce!22691
| * | | | Move Repository#wrapped_gitaly_errors into concernBob Van Landuyt2018-10-301-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Resolve "Create new group: Rename form fields and update UI"Martin Wortschack2018-10-305-17/+39
|/ / / /
* | | | Merge branch '53227-empty-list' into 'master'Phil Hughes2018-10-302-0/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-302-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-301-19/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-301-19/+0
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-301-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-291-1/+5
| | | | | |
* | | | | | Merge branch 'mr-diff-discussion-deletion' into 'master'Filipa Lacerda2018-10-301-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-301-0/+60
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-291-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Renaming Secret Variables in the codebaseMarcel Amirault2018-10-306-29/+29
| |_|/ / / / |/| | | | |
* | | | | | Merge remote-tracking branch 'origin/master' into dev-masterJan Provaznik2018-10-301-1/+1
|\ \ \ \ \ \
| * | | | | | Fix problem with spec that showed up in EE mergeBrett Walker2018-10-291-1/+1
| | | | | | |
* | | | | | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-2985-657/+2181
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'Douwe Maan2018-10-2918-38/+40
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make new merge request URL more friendly when pushing code Closes #53012 See merge request gitlab-org/gitlab-ce!22526
| | * | | | | Fix specsblackst0ne2018-10-267-15/+16
| | | | | | |
| | * | | | | Update other linksblackst0ne2018-10-269-18/+19
| | | | | | |
| | * | | | | Make new merge request URL more friendly when pushing codeblackst0ne2018-10-232-5/+5
| | | | | | |
| * | | | | | Delete job_spec.jsWinnie Hellmann2018-10-291-265/+0
| | |_|/ / / | |/| | | |
| * | | | | Fix broken "Show whitespace changes" button on MR "Changes" tabJacques Erasmus2018-10-292-1/+167
| | | | | |
| * | | | | Remove all tables from Pipeline page when there is no job for the PipelineTakuya Noguchi2018-10-291-27/+33
| | | | | |
View Lorry Controller Status