summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Resolve "Endless scroll loader is visible on user profile overview page"Martin Wortschack2018-10-243-7/+16
|
* Merge branch '53013-duplicate-escape' into 'master'Phil Hughes2018-10-231-6/+5
|\ | | | | | | | | | | | | Removes duplicate escape from job item Closes #53013 See merge request gitlab-org/gitlab-ce!22536
| * Removes escape from job item53013-duplicate-escapeFilipa Lacerda2018-10-231-6/+5
| | | | | | | | | | Tooltips aren't using v-html anymore thus causing escape not to be needed
* | Update Runner Chart to 0.1.35Tomasz Maczukin2018-10-231-1/+1
| |
* | Merge branch 'support-license-management-and-performance' into 'master'Grzegorz Bizon2018-10-231-3/+9
|\ \ | | | | | | | | | | | | Support licenses and performance See merge request gitlab-org/gitlab-ce!22175
| * | Support licenses and performancesupport-license-management-and-performanceKamil Trzciński2018-10-221-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new syntax for all licenses and performance jobs: ```yaml job: reports: performance: performance.json license_management: gl-license-management-report.json ```
* | | Update Todo icons in collapsed sidebar for Issues and MRsKushal Pandya2018-10-232-4/+4
| | |
* | | Merge branch 'lfs-project-attribute-alias' into 'master'Nick Thomas2018-10-231-0/+2
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Alias the lfs_enabled method Closes #49348 See merge request gitlab-org/gitlab-ce!22501
| * | Alias the lfs_enabled methodlfs-project-attribute-aliasCindy Pallares2018-10-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | We currently check for `project.lfs_enabled` to display the state of lfs being enabled/disabled, but this is set to nil by default, even when lfs is enabled. Aliasing the method to #lfs_enabled? will return the correct state.
* | | Add `Any` option to milestone filterHeinrich Lee Yu2018-10-232-6/+14
| | |
* | | Resolve "Filter discussion (tab) by comments or activity in issues and merge ↵Oswaldo Ferreira2018-10-2329-29/+364
| | | | | | | | | | | | requests"
* | | Merge branch '42611-removed-branch-link' into 'master'Grzegorz Bizon2018-10-232-3/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Removed branch link in pipelines page is broken" Closes #42611 See merge request gitlab-org/gitlab-ce!21451
| * | | Do not raise error when checking pipeline reference42611-removed-branch-linkGrzegorz Bizon2018-10-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return from the `Ci::Pipeline#ref_exists?` in case when there is no repository present. This also fixes pipeline page feature specs by changing pipeline reference instead of stubbing `ref_exist?` method.
| * | | Fix pipeline reference existence check and add specsGrzegorz Bizon2018-10-221-3/+3
| | | |
| * | | Creates ref_exists? method for Pipeline classFilipa Lacerda2018-10-082-1/+5
| | | |
| * | | Merge branch 'master' into 42611-removed-branch-linkFilipa Lacerda2018-10-081538-7517/+15183
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1252 commits) Render log artifact files in GitLab Check disabled_services when finding a service Fix invalid parent path on group settings page Backport CE changes for: [Frontend only] Batch comments on merge requests Add button to insert table in markdown editor Update GITALY_SERVER_VERSION Updates Laravel.gitlab-ci.yml template Update operations metrics empty state Fix LFS uploaded images not being rendered Prepare admin/projects/show view to allow EE specific feature Add timed incremental rollout to Auto DevOps Update spec comment to point to correct issue Fix documentation for variables Document Security and Licence Management features permissions Fix time dependent jobs spec Use a CTE to remove the query timeout Backport changes from gitlab-ee!7538 Fix CE to EE merge (backport) Add changelog entry Refactor Feature.flipper method ...
| * | | | Render link to branch only when branch still existsFilipa Lacerda2018-08-311-1/+5
| | | | |
* | | | | Merge branch '52840-fix-runners-details-page' into 'master'Grzegorz Bizon2018-10-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Group runner confused about whether or not is protected" Closes #52840 See merge request gitlab-org/gitlab-ce!22459
| * | | | | Fix rendering of 'Protected' valueTomasz Maczukin2018-10-221-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch '46884-remove-card-title' into 'master'Annabel Dunstone Gray2018-10-2213-66/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove card-title in card-header Closes #46884 See merge request gitlab-org/gitlab-ce!19335
| * | | | | Remove .card-title from .card-header for BS4 migrationTakuya Noguchi2018-10-1913-66/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces .card-header > hX.card-title with hX.card-header to remove .card-title. At a occurrence where bold styling is not necessary, div.card-header is used instead. By full removal of .card-title at the moment, all workarounds for BS4's card-title are removed as well. More information: https://getbootstrap.com/docs/4.0/migration/#panels Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | Merge branch '51716-add-kubernetes-namespace-model' into 'master'Andreas Brandl2018-10-224-1/+70
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Clusters::KubernetesNamespace model See merge request gitlab-org/gitlab-ce!22404
| * | | | | | Add Clusters::KubernetesNamespace model51716-add-kubernetes-namespace-modelMayra Cabrera2018-10-224-1/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This model will be used to persist into database Kubernetes properties, such as namespace, service account name and service account token.
* | | | | | | Merge branch 'blackst0ne-bump-mermaid' into 'master'Mike Greiling2018-10-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump mermaid to 8.0.0-rc.8 Closes #52601, #50105, and #40470 See merge request gitlab-org/gitlab-ce!22509
| * | | | | | | Bump mermaid to 8.0.0-rc.8blackst0ne-bump-mermaidblackst0ne2018-10-221-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit moves `mermaid` from blackst0ne-mermaid package to the upstream version. The reason why the fork was used was this bug[1]. The bug has been fixed, so there's no need to maintain my fork anymore. [1]: https://github.com/knsv/mermaid/issues/584
* | | | | | | Merge branch 'change-branch-font-type-in-tag-creation' into 'master'Annabel Dunstone Gray2018-10-221-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change branch font type in tag creation See merge request gitlab-org/gitlab-ce!22454
| * | | | | | | Change branch font type in tag creationGeorge Tsiolis2018-10-221-1/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'refactor-project-rename-repo' into 'master'Robert Speicher2018-10-223-74/+142
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Project#rename_repo to a service class See merge request gitlab-org/gitlab-ce!22419
| * | | | | | | Move Project#rename_repo to a service classrefactor-project-rename-repoYorick Peterse2018-10-223-74/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the logic of Project#rename_repo and all methods _only_ used by this method into a new service class: Projects::AfterRenameService. By moving this code into a separate service class we can more easily refactor it, and we also get rid of some RuboCop "disable" statements automatically. During the refactoring of this code, I removed most of the explicit logging using Gitlab::AppLogger. The data that was logged would not be useful when debugging renaming issues, as it does not add any value on top of data provided by users. I also removed a variety of comments that either mentioned something the code does in literal form, or contained various grammatical errors. Instead we now resort to more clearly named methods, removing the need for code comments. This method was chosen based on analysis in https://gitlab.com/gitlab-org/release/framework/issues/28. In this issue we determined this method has seen a total of 293 lines being changed in it. We also noticed that RuboCop determined the ABC size (https://www.softwarerenovation.com/ABCMetric.pdf) was too great.
* | | | | | | | Extract JobContainerItem componentWinnie Hellmann2018-10-222-46/+73
| | | | | | | |
* | | | | | | | Backport rescue in Project#import_url from EEbackport-ee-import-url-rescueYorick Peterse2018-10-221-0/+2
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE added a `rescue` to the method Project#import_url, which could cause merge conflicts when changing this method. This commit backports those changes to CE, reducing the chances of running into a merge conflict.
* | | | | | | Update Guide for Microsoft Teams Notification IntegrationAbubakar Siddiq Ango2018-10-221-1/+1
| | | | | | |
* | | | | | | Merge branch 'mr-creation-source-project-filtering' into 'master'Filipa Lacerda2018-10-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed source projects not filtering Closes #52728 See merge request gitlab-org/gitlab-ce!22515
| * | | | | | | Fixed source projects not filteringPhil Hughes2018-10-221-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filtering source projects in the merge request creation form would show a flash error because it is trying to filter remotely to an undefined URL. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52728
* | | | | | | Merge branch 'drop-allow_overflow-option-duration_in_numbers' into 'master'Grzegorz Bizon2018-10-222-10/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop allow overflow option duration in numbers Closes #52284 See merge request gitlab-org/gitlab-ce!22246
| * | | | | | | Drop `allow_overflow` option in `TimeHelper.duration_in_numbers`Shinya Maeda2018-10-182-10/+8
| | | | | | | |
* | | | | | | | Merge branch '52559-applications-api-get-delete' into 'master'Rémy Coutable2018-10-222-6/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Applications API endpoints for listing and deleting entries. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52559 See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22296
| * | | | | | | | Disable offense on the appropriate line only !22296JB Vasseur2018-10-191-6/+2
| | | | | | | | |
| * | | | | | | | Remove useless braces !22296JB Vasseur2018-10-181-1/+1
| | | | | | | | |
| * | | | | | | | Use ApplicationsFinder !22296JB Vasseur2018-10-181-6/+2
| | | | | | | | |
| * | | | | | | | Source cleaning !22296JB Vasseur2018-10-181-1/+1
| | | | | | | | |
| * | | | | | | | Use application finder for Doorkeeper ApplicationsJB Vasseur2018-10-151-0/+26
| | | | | | | | |
* | | | | | | | | Frontend: Review app changesFilipa Lacerda2018-10-225-24/+219
| | | | | | | | |
* | | | | | | | | Remove base64 encoding from files that contain plain textJacques Erasmus2018-10-221-13/+25
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'use-raw-file-format' into 'master'Grzegorz Bizon2018-10-222-11/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add RAW file format which is used to store security reports Closes gitlab-ee#7996 See merge request gitlab-org/gitlab-ce!22365
| * | | | | | | | Make all legacy security reports to use raw formatuse-raw-file-formatKamil Trzciński2018-10-162-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This introduces and uses `:raw` format for all legacy reports, the ones that do not have yet proper parsers on Backend - Raw format is needed to make Frontend be able to parse reports, without the need of decompressing, - This also extends fixtures to seed security reports with database, even though parser code is part of EE
* | | | | | | | | Merge branch 'rails5-fix-delete-blob' into 'master'Grzegorz Bizon2018-10-221-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Rails5: fix delete blob See merge request gitlab-org/gitlab-ce!22456
| * | | | | | | | Rails5: fix delete blobJasper Maes2018-10-181-1/+1
| | | | | | | | |
* | | | | | | | | Resolve "/assign me quick action doesn't work if there is extra white space"Cindy Pallares 🦉2018-10-191-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'ce-5987-group-file-templates' into 'master'Robert Speicher2018-10-196-11/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport of changes to suppport group file templates See merge request gitlab-org/gitlab-ce!22310
View Lorry Controller Status