summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Whitelist none method from ActiveRecord::Queryingda-rubocop-whitelist-active-record-noneDouglas Barbosa Alexandre2018-10-3112-28/+0
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'prettify-all-remaining-things' into 'master'Filipa Lacerda2018-10-3162-1593/+1797
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prettify remaining files with differences in CE and EE See merge request gitlab-org/gitlab-ce!22702
| * | | | | | | | | Fix eslint violationsMike Greiling2018-10-311-1/+1
| | | | | | | | | |
| * | | | | | | | | Prettify remaining files with differences in CE and EEMike Greiling2018-10-3162-1592/+1796
| | | | | | | | | |
* | | | | | | | | | Merge branch 'leipert-migrate-gitlab-svgs' into 'master'Mike Greiling2018-10-313-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename @gitlab-org/gitlab-svgs to @gitlab/svgs See merge request gitlab-org/gitlab-ce!22714
| * | | | | | | | | Rename @gitlab-org/gitlab-svgs to @gitlab/svgsleipert-migrate-gitlab-svgsLukas Eipert2018-10-313-3/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'gt-fix-quick-links-button-styles' into 'master'Annabel Dunstone Gray2018-10-314-5/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix quick links button styles Closes #52220 and #52063 See merge request gitlab-org/gitlab-ce!22657
| * | | | | | | | Fix quick links button stylesGeorge Tsiolis2018-10-294-5/+5
| | | | | | | | |
* | | | | | | | | Merge branch '53335-cancel-job-redirects-to-job-page' into 'master'Grzegorz Bizon2018-10-311-4/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send continue parameter on for `cancel_path` Closes #53335 See merge request gitlab-org/gitlab-ce!22712
| * | | | | | | | | Send continue parameter on for cancel_pathSteve Azzopardi2018-10-311-4/+12
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'remove-ee-specific-code-from-plan-and-create-models' into 'master'Douglas Barbosa Alexandre2018-10-313-5/+9
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Remove EE-specific code from 'Discussion' models See merge request gitlab-org/gitlab-ce!22687
| * | | | | | | | Remove EE-specific code from DiscussionNoteremove-ee-specific-code-from-plan-and-create-modelsSean McGivern2018-10-263-5/+9
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'gl-ui-pagination' into 'master'Phil Hughes2018-10-312-2/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gitlab-ui's pagination from global See merge request gitlab-org/gitlab-ce!22704
| * | | | | | | | Remove gitlab-ui's pagination from globalgl-ui-paginationClement Ho2018-10-302-2/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Remove gitlab-ui's modal from globalClement Ho2018-10-313-8/+13
| | | | | | | |
* | | | | | | | Merge branch 'gt-fix-ide-typos-in-props' into 'master'Phil Hughes2018-10-314-7/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix typos in IDE props See merge request gitlab-org/gitlab-ce!22685
| * | | | | | | Fix typos in IDE propsGeorge Tsiolis2018-10-304-7/+7
| | |_|_|/ / / | |/| | | | |
* | | | | | | Adds required prop to the post merge pipeline53386-broken-masterFilipa Lacerda2018-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two different MRs updating the same code were merged and this was not caught prior to merge. This MR adds the missing prop to the post merge pipeline
* | | | | | | Merge branch ↵Filipa Lacerda2018-10-314-2/+19
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-241-1/+2
| | | | | | |
| * | | | | | Regenerates pot filesFilipa Lacerda2018-10-241-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes documentation path a required prop
| * | | | | | Updates CI/CD documentation link in MR widgetFilipa Lacerda2018-10-243-3/+18
| | | | | | |
| * | | | | | Fix the troubleshooting docs linkMatija Čupić2018-10-243-4/+3
| | | | | | |
| * | | | | | Add docs linkMatija Čupić2018-10-243-1/+4
| | | | | | |
| * | | | | | Change CI status error messageMatija Čupić2018-10-241-1/+1
| | | | | | |
* | | | | | | Merge branch 'add-language-param-to-highlight' into 'master'Douwe Maan2018-10-3013-22/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add language param to highlight See merge request gitlab-org/gitlab-ce!21584
| * | | | | | | Centralize loading blob data before highlightingMark Chao2018-10-301-0/+2
| | | | | | | |
| * | | | | | | Allow FoundBlob to access language from gitattributesMark Chao2018-10-302-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-304-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to DRY the repeated file size check. Move spec and constants to Highlight
| * | | | | | | Make Highlight accept language paramMark Chao2018-10-3010-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-302-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force FoundBlob to use BlobPresenter
| * | | | | | | Add access to Blob's language from gitattributesMark Chao2018-10-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ported from Highlight class since it as a concept is more related to blob, and this allows more flexibility.
* | | | | | | | Fix application layout form descriptionAndreas Kämmerle2018-10-301-2/+2
| | | | | | | |
* | | | | | | | Resolve "Create new group: Rename form fields and update UI"Martin Wortschack2018-10-303-40/+50
| | | | | | | |
* | | | | | | | Merge branch 'sh-fix-search-relative-urls' into 'master'Clement Ho2018-10-301-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53259
* | | | | | | | | Merge branch 'fl-missing-i18n' into 'master'Mike Greiling2018-10-305-15/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds missing i18n to pipelines table See merge request gitlab-org/gitlab-ce!22690
| * | | | | | | | | Adds missing i18n to pipelines tablefl-missing-i18nFilipa Lacerda2018-10-305-15/+18
| | | | | | | | | |
* | | | | | | | | | Merge branch '53227-empty-list' into 'master'Phil Hughes2018-10-302-24/+47
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Empty list for links to changed pages in Review App from MR Widget" Closes #53227 See merge request gitlab-org/gitlab-ce!22665
| * | | | | | | | | | Prevents review app to render an empty dropdown.Filipa Lacerda2018-10-302-24/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2/+2
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-7/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-7/+3
| | | | | | | | | | |
* | | | | | | | | | | Backport ee 7203 sticky logs topbarSimon Knox2018-10-303-74/+100
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'mr-diff-discussion-deletion' into 'master'Filipa Lacerda2018-10-302-8/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-302-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3010-14/+14
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | |