Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2018-10-19Remove the `ForkedProjectLink` modelBob Van Landuyt
This removes the `ForkedProjectLink` model that has been replaced by the `ForkNetworkMember` and `ForkNetwork` combination. All existing relations have been adjusted to use these new models. The `forked_project_link` table has been dropped. The "Forks" count on the admin dashboard has been updated to count all `ForkNetworkMember` rows and deduct the number of `ForkNetwork` rows. This is because now the "root-project" of a fork network also has a `ForkNetworkMember` row. This count could become inaccurate when the root of a fork network is deleted.
2018-10-15Merge branch '52614-bugs-on-deployment-status-in-job-log-page' into 'master'Grzegorz Bizon
Send deployment_status when job starts environment Closes #52614 See merge request gitlab-org/gitlab-ce!22354
2018-10-15Send deployment_status when job starts environmentSteve Azzopardi
The check was if the job `has_environment` which results into showing the environment information when the job stops the environment. This result into having a blank `deployment_status`. Use `starts_environment?` to be the same as the haml we have in 11.3 https://gitlab.com/gitlab-org/gitlab-ce/blob/30f019dca78bb64bcb8b355a267be006884e6d8f/app/views/projects/jobs/show.html.haml#L28
2018-10-15Merge branch 'sh-add-deploy-token-qa' into 'master'Rémy Coutable
Add GitLab QA spec for adding a deploy token See merge request gitlab-org/gitlab-ce!22207
2018-10-15Merge branch 'ce-7921-fix-batch-comments-resolution' into 'master'Phil Hughes
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
2018-10-15Merge branch '52421-show-canary-no-canary-in-the-performance-bar' into 'master'Sean McGivern
Resolve "Show canary / no-canary in the performance bar" Closes #52421 See merge request gitlab-org/gitlab-ce!22222
2018-10-15Only display merge commit SHA when it existsMark Chao
2018-10-12Merge branch '52614-update-job-started-check' into 'master'Tim Zallmann
Updates the check for started in job header See merge request gitlab-org/gitlab-ce!22329
2018-10-12Add stage name in job.json responseSteve Azzopardi
2018-10-12Updates the check for started in job headerFilipa Lacerda
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
2018-10-12Backport CE changes for Ops Dashboard in EEPeter Leitzen
2018-10-12Merge branch 'fl-update-svgs' into 'master'Mike Greiling
Updates gitlab-svg dependency See merge request gitlab-org/gitlab-ce!22299
2018-10-12Add GitLab QA spec for adding a deploy tokenStan Hu
2018-10-12Show if the host is a canary host in the perf barSean McGivern
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.
2018-10-12Merge branch '52608-sidebar' into 'master'Tim Zallmann
Hide job sidebar on mobile Closes #52608 See merge request gitlab-org/gitlab-ce!22314
2018-10-12Merge branch '52361-fix-file-tree-mobile' into 'master'Filipa Lacerda
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
2018-10-12Updates gitlab-svg dependencyFilipa Lacerda
2018-10-12Hide job sidebar on mobileFilipa Lacerda
This commit adds back `js-` classes needed to automatically collapse the sidebar on resize.
2018-10-12Backport EE fixes to CE checking resolvabilityAndré Luís
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.
2018-10-12Improve MR file tree on small screensAndré Luís
2018-10-12Fix broken file name navigation on MRsJacques Erasmus
2018-10-11Fix erased block not being rendered when job was erasedFilipa Lacerda
2018-10-11Merge branch 'gt-update-application-copy-secret-to-clipboard-data' into 'master'Annabel Dunstone Gray
Update copy to clipboard button data for application secret Closes #52572 See merge request gitlab-org/gitlab-ce!22268
2018-10-11Merge branch 'sh-fix-project-deletion-with-export' into 'master'Robert Speicher
Fix project deletion when there is a export available Closes #52362 See merge request gitlab-org/gitlab-ce!22276
2018-10-11Merge branch '52472-pipeline-endpoint-json' into 'master'Tim Zallmann
Adds `.json` to the end of pipelines endpoint Closes #52472 See merge request gitlab-org/gitlab-ce!22293
2018-10-11Stuck block URL links to runners settingsFilipa Lacerda
2018-10-11Feature improved branch filter sortingJason Rutherford
2018-10-11Merge branch 'qa-257-instance-wide-saml-sso' into 'master'Rémy Coutable
Instance SAML SSO e2e test Closes gitlab-qa#257 See merge request gitlab-org/gitlab-ce!22271
2018-10-11Add new sort option "most_stars" to "Group > Children" pagesRene Hennig
2018-10-11Adds `.json` to the end of pipelines endpointFilipa Lacerda
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
2018-10-11Merge branch 'ml-qa-add-members' into 'master'Rémy Coutable
QA: Add test of adding a member to a project See merge request gitlab-org/gitlab-ce!21753
2018-10-11Initial commitSanad Liaquat
Use ACCEPT_INSECURE_CERTS env var and fix step Simplify saml signin Fix rubo cop offence Add missing # frozen_string_literal: true
2018-10-10Fix project deletion when there is a export availableStan Hu
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
2018-10-10Add test to add a new project memberMark Lapierre
Adds a new QA test and the required page objects and related changes
2018-10-10Merge branch 'prettify-all-the-things-5' into 'master'Tim Zallmann
Prettify all the things (part 5) See merge request gitlab-org/gitlab-ce!22255
2018-10-10Merge branch 'prettify-all-the-things-2' into 'master'Tim Zallmann
Prettify all the things (part 2) See merge request gitlab-org/gitlab-ce!22250
2018-10-10Merge branch ↵Clement Ho
'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
2018-10-10Convert remaining issue board components into ES module syntaxMike Greiling
2018-10-10Remove file extension to force sprockets to inline dropzone cssMike Greiling
2018-10-10Update copy to clipboard button data for application secretGeorge Tsiolis
2018-10-10Retry registration 3 times before failingMark Lapierre
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.
2018-10-10Merge branch 'zj-circuit-breaker-removal' into 'master'Douwe Maan
Remove Git circuit breaker Closes #45405 See merge request gitlab-org/gitlab-ce!22212
2018-10-10Merge branch '7631-remove-security-report-summary-from-pipelines-view' into ↵Fatih Acet
'master' Backport of CE changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7844 See merge request gitlab-org/gitlab-ce!22221
2018-10-10Merge branch 'ml-qa-add-file-templates' into 'master'Sean McGivern
Add test of adding file templates via Web IDE and Files view See merge request gitlab-org/gitlab-ce!21914
2018-10-10Prettify merge_conflicts monitoring and notebook modulesMike Greiling
2018-10-10Prettify lib/utils modulesMike Greiling
2018-10-10Prettify issue_show and jobs modulesMike Greiling
2018-10-10Remove Git circuit breakerZeger-Jan van de Weg
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.
2018-10-10Prettify ide modulesMike Greiling
2018-10-09Merge branch 'gt-update-wiki-empty-state' into 'master'Fatih Acet
Update wiki empty state See merge request gitlab-org/gitlab-ce!22218