summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* 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 'sh-add-deploy-token-qa' into 'master'Rémy Coutable2018-10-153-9/+9
|\ | | | | | | | | Add GitLab QA spec for adding a deploy token See merge request gitlab-org/gitlab-ce!22207
| * Add GitLab QA spec for adding a deploy tokenStan Hu2018-10-123-9/+9
| |
* | Merge branch 'ce-7921-fix-batch-comments-resolution' into 'master'Phil Hughes2018-10-151-1/+13
|\ \ | | | | | | | | | | | | Backport CE changes for: Resolves "Reviews: Resolving or unresolving discussions with “Add comment now” does not work" See merge request gitlab-org/gitlab-ce!22303
| * | Backport EE fixes to CE checking resolvabilityAndré Luís2018-10-111-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE branch: 7921-fix-batch-comments-resolution fixes the checks to know whether discussion will be resolved upon posting a comment or not. It covers scenarios where Batch Comments are enabled and disabled. To minimise risk of conflicts between CE and EE, the checks have been backported. this.shouldResolve() will not exist in CE.
* | | Merge branch '52421-show-canary-no-canary-in-the-performance-bar' into 'master'Sean McGivern2018-10-153-1/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Show canary / no-canary in the performance bar" Closes #52421 See merge request gitlab-org/gitlab-ce!22222
| * | | Show if the host is a canary host in the perf barSean McGivern2018-10-123-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the request came from a canary host, show this in the performance bar by: 1. Adding a bird emoji. 2. Colouring the hostname yellow.
* | | | Only display merge commit SHA when it existsMark Chao2018-10-151-12/+14
| | | |
* | | | Merge branch '52614-update-job-started-check' into 'master'Tim Zallmann2018-10-122-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Updates the check for started in job header See merge request gitlab-org/gitlab-ce!22329
| * | | | Updates the check for started in job headerFilipa Lacerda2018-10-122-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function that was checking if the job was started or not was expecting a boolean, however it was receiving a null. During the refactor the condition was changed, causing the function to break with null This commit fixes the check
* | | | | Add stage name in job.json responseSteve Azzopardi2018-10-126-22/+29
|/ / / /
* | | | Backport CE changes for Ops Dashboard in EEPeter Leitzen2018-10-126-23/+56
| | | |
* | | | Merge branch 'fl-update-svgs' into 'master'Mike Greiling2018-10-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Updates gitlab-svg dependency See merge request gitlab-org/gitlab-ce!22299
| * | | | Updates gitlab-svg dependencyFilipa Lacerda2018-10-121-1/+1
| | |_|/ | |/| |
* | | | Merge branch '52608-sidebar' into 'master'Tim Zallmann2018-10-123-4/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide job sidebar on mobile Closes #52608 See merge request gitlab-org/gitlab-ce!22314
| * | | | Hide job sidebar on mobileFilipa Lacerda2018-10-123-4/+6
| |/ / / | | | | | | | | | | | | | | | | This commit adds back `js-` classes needed to automatically collapse the sidebar on resize.
* | | | Merge branch '52361-fix-file-tree-mobile' into 'master'Filipa Lacerda2018-10-124-4/+29
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Resolve "Make file browser hidden by default for mobile screens" and improve layout in small screens too Closes #52361 See merge request gitlab-org/gitlab-ce!22273
| * | | Improve MR file tree on small screensAndré Luís2018-10-114-4/+29
| | | |
* | | | Fix broken file name navigation on MRsJacques Erasmus2018-10-112-3/+8
| | | |
* | | | Fix erased block not being rendered when job was erasedFilipa Lacerda2018-10-111-2/+2
| |_|/ |/| |
* | | Merge branch 'gt-update-application-copy-secret-to-clipboard-data' into 'master'Annabel Dunstone Gray2018-10-112-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update copy to clipboard button data for application secret Closes #52572 See merge request gitlab-org/gitlab-ce!22268
| * | | Update copy to clipboard button data for application secretGeorge Tsiolis2018-10-102-2/+2
| |/ /
* | | Merge branch 'sh-fix-project-deletion-with-export' into 'master'Robert Speicher2018-10-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix project deletion when there is a export available Closes #52362 See merge request gitlab-org/gitlab-ce!22276
| * | | Fix project deletion when there is a export availableStan Hu2018-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project deletions were failing with "Can't modify frozen hash" because: 1. Project#remove_exports was called in the after_destroy hook 2. This would remove the file and update ImportExportUpload 3. ImportExportUpload#save would attempt to write to a destroyed model To avoid this, we just check if ImportExportUpload has been destroyed before attempting to save it. This would have a side effect of not running after_commit hooks to delete the repository on disk, making it impossible to delete the project entirely. Closes #52362
* | | | Merge branch '52472-pipeline-endpoint-json' into 'master'Tim Zallmann2018-10-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `.json` to the end of pipelines endpoint Closes #52472 See merge request gitlab-org/gitlab-ce!22293
| * | | | Adds `.json` to the end of pipelines endpointFilipa Lacerda2018-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the job page is rendered we fetch the pipeline endpoint to render the stages in the sidebar. Without `.json` the response is cached, and when the user goes back to the pipeline's page it renders the json output instead of the Vue app
* | | | | Stuck block URL links to runners settingsFilipa Lacerda2018-10-113-4/+6
| | | | |
* | | | | Feature improved branch filter sortingJason Rutherford2018-10-111-6/+35
| | | | |
* | | | | Merge branch 'qa-257-instance-wide-saml-sso' into 'master'Rémy Coutable2018-10-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instance SAML SSO e2e test Closes gitlab-qa#257 See merge request gitlab-org/gitlab-ce!22271
| * | | | | Initial commitSanad Liaquat2018-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ACCEPT_INSECURE_CERTS env var and fix step Simplify saml signin Fix rubo cop offence Add missing # frozen_string_literal: true
* | | | | | Add new sort option "most_stars" to "Group > Children" pagesRene Hennig2018-10-112-5/+11
| |/ / / / |/| | | |
* | | | | Merge branch 'ml-qa-add-members' into 'master'Rémy Coutable2018-10-113-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | QA: Add test of adding a member to a project See merge request gitlab-org/gitlab-ce!21753
| * | | | Add test to add a new project memberMark Lapierre2018-10-103-4/+4
| | |/ / | |/| | | | | | | | | | Adds a new QA test and the required page objects and related changes
* | | | Merge branch 'prettify-all-the-things-5' into 'master'Tim Zallmann2018-10-1014-128/+93
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Prettify all the things (part 5) See merge request gitlab-org/gitlab-ce!22255
| * | | | Prettify ide modulesMike Greiling2018-10-1014-128/+93
| | | | |
* | | | | Merge branch 'prettify-all-the-things-2' into 'master'Tim Zallmann2018-10-1056-1523/+1546
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Prettify all the things (part 2) See merge request gitlab-org/gitlab-ce!22250
| * | | | Prettify merge_conflicts monitoring and notebook modulesMike Greiling2018-10-1019-354/+341
| | | | |
| * | | | Prettify lib/utils modulesMike Greiling2018-10-1014-89/+131
| | | | |
| * | | | Prettify issue_show and jobs modulesMike Greiling2018-10-1023-1080/+1074
| |/ / /
* | | | Merge branch ↵Clement Ho2018-10-101-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '52103-dropzone-css-is-failing-to-load-on-rspec-dev-and-staging-11-4-0-rc' into 'master' Resolve "Dropzone css is failing to load on rspec, dev and staging 11.4.0 RC" Closes #52103 See merge request gitlab-org/gitlab-ce!22272
| * | | | Remove file extension to force sprockets to inline dropzone cssMike Greiling2018-10-101-1/+1
| | |/ / | |/| |
* | | | Convert remaining issue board components into ES module syntaxMike Greiling2018-10-1021-173/+174
| | | |
* | | | Retry registration 3 times before failingMark Lapierre2018-10-101-6/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Registration intermittently fails without an obvious cause. The action to click the button seems to move focus to the right button but nothing happens. This change attempts to retry the action under the assumption that Capybara or Chrome is misbehaving. It also updates the selectors for the sign up page.
* | | Merge branch 'zj-circuit-breaker-removal' into 'master'Douwe Maan2018-10-1010-144/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove Git circuit breaker Closes #45405 See merge request gitlab-org/gitlab-ce!22212
| * | | Remove Git circuit breakerZeger-Jan van de Weg2018-10-1010-144/+11
| |/ / | | | | | | | | | | | | | | | | | | Was introduced in the time that GitLab still used NFS, which is not required anymore in most cases. By removing this, the API it calls will return empty responses. This interface has to be removed in the next major release, expected to be 12.0.
* | | Merge branch '7631-remove-security-report-summary-from-pipelines-view' into ↵Fatih Acet2018-10-101-2/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Backport of CE changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7844 See merge request gitlab-org/gitlab-ce!22221
| * | | Remove security report summary from pipelines viewLukas Eipert2018-10-091-2/+0
| | | | | | | | | | | | | | | | | | | | This removes the Vue component, corresponding tests and haml/bundle entry points for the Security Report summary in the pipelines view
* | | | Merge branch 'ml-qa-add-file-templates' into 'master'Sean McGivern2018-10-1010-21/+25
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Add test of adding file templates via Web IDE and Files view See merge request gitlab-org/gitlab-ce!21914
| * | | Add tests of adding file templatesMark Lapierre2018-10-0910-21/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds tests that adds new files via file templates via the Files view and the Web IDE. Includes changes to page objects and associated code Fetches template content from the API rather than hardcoding strings that will need to be updated if the templates change. Some of the content is stored as flat files but we can't use them because they're not included in the docker images gitlab-qa uses.
* | | | Merge branch 'gt-update-wiki-empty-state' into 'master'Fatih Acet2018-10-091-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update wiki empty state See merge request gitlab-org/gitlab-ce!22218