summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* 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 log artifact files in GitLabZeger-Jan van de Weg2018-10-081-1/+1
| |
| * Merge branch 'bw-fix-checking-disabled-services' into 'master'51761-create-new-project-auto-populate-project-slug-string-to-project-name-if-name-is-empty34758-split-create-gcp-controllerStan Hu2018-10-061-3/+3
| |\ | | | | | | | | | | | | Check disabled_services when finding a service See merge request gitlab-org/gitlab-ce!22172
| | * Check disabled_services when finding a serviceBrett Walker2018-10-061-3/+3
| | |
| * | Fix invalid parent path on group settings pageDmitriy Zaporozhets2018-10-061-2/+2
| | |
| * | Backport CE changes for: [Frontend only] Batch comments on merge requestsAndré Luís2018-10-0615-50/+123
| |/
| * Add button to insert table in markdown editorGeorge Tsiolis2018-10-062-0/+18
| |
| * Merge branch 'backport-ce-to-ee-merge' into 'master'Stan Hu2018-10-061-5/+6
| |\ | | | | | | | | | | | | Backport of CE upstream - 2018-10-05 12:21 UTC See merge request gitlab-org/gitlab-ce!22154
| | * Fix CE to EE merge (backport)Kamil Trzciński2018-10-051-5/+6
| | |
| * | Update operations metrics empty stateGeorge Tsiolis2018-10-061-9/+9
| | |
| * | Fix LFS uploaded images not being renderedOswaldo Ferreira2018-10-053-1/+12
| | |
| * | Merge branch 'ee-7126-admin-projects-geo-status' into 'master'Douglas Barbosa Alexandre2018-10-051-0/+2
| |\ \ | | | | | | | | | | | | | | | | EE Backport: enable Geo Status widget in admin/projects See merge request gitlab-org/gitlab-ce!22161
| | * | Prepare admin/projects/show view to allow EE specific featureGabriel Mazetto2018-10-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In EE it will render a Geo Status widget when Geo is enabled and it is in a secondary node. Also added minimal specs to that action.
| * | | Add timed incremental rollout to Auto DevOpsAlessio Caiazza2018-10-052-6/+23
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto DevOps deployment strategies now supports timed incremental rollout. We are deprecating the usage of INCREMENTAL_ROLLOUT_ENABLED environment variable in Auto DevOps template. The new behavior will be driven by the INCREMENTAL_ROLLOUT_MODE variable that can either be manual (same as INCREMENTAL_ROLLOUT_ENABLED) or timed. Rollout deployments will be executed using a 5 minute delay between each job.
| * | Merge branch ↵Sean McGivern2018-10-052-20/+19
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43109-ci_environments_status-json-executes-more-than-100-queries' into 'master' Resolve "Controller Projects::MergeRequestsController#ci_environments_status.json executes more than 100 SQL queries" Closes #43109 See merge request gitlab-org/gitlab-ce!21996
| | * | Don't build project services unneccesarilyBrett Walker2018-10-042-20/+19
| | | |
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqBob Van Landuyt2018-10-054-14/+22
| |\ \ \
| | * \ \ Merge branch 'security-bw-confidential-titles-through-markdown-api' into ↵Bob Van Landuyt2018-10-051-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [master] Confidential issue/private snippet titles can be read by unauthenticated user through GFM markdown API Closes #2706 See merge request gitlab/gitlabhq!2507
| | | * | | post_process markdown redered by APIBrett Walker2018-09-291-1/+1
| | | | | |
| | * | | | Merge branch 'security-fix-leaking-private-project-namespace' into 'master'Bob Van Landuyt2018-10-052-12/+20
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Fix leaking private project namespace Closes #2708 See merge request gitlab/gitlabhq!2529
| | | * | | | Filter system notes with public and private cross referencesBrett Walker2018-10-022-12/+20
| | | | | | |
| | * | | | | Merge branch 'security-osw-user-info-leak-discussions' into 'master'Bob Van Landuyt2018-10-051-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [security - master] Filter user sensitive data from discussions JSON See merge request gitlab/gitlabhq!2536
| | | * | | | | Filter user sensitive data from discussions JSONOswaldo Ferreira2018-10-011-1/+1
| | | | |/ / / | | | |/| | |
| * | | | | | Merge branch 'issue_43097' into 'master'Sean McGivern2018-10-053-19/+27
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move related branches to service Closes #43097 See merge request gitlab-org/gitlab-ce!22094
| | * | | | | | Move issue related_branches to serviceFelipe Artur2018-10-043-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the related_branches method from Issue model to RelatedBranchesService
| * | | | | | | Merge branch 'ce-5987-project-templates-api' into 'master'Robert Speicher2018-10-0514-123/+122
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new project-specific templates API endpoint See merge request gitlab-org/gitlab-ce!22118
| | * | | | | | | Backport project template API to CENick Thomas2018-10-0514-123/+122
| | | | | | | | |
| * | | | | | | | Merge branch 'sh-revert-broken-deploy-key-change' into 'master'Robert Speicher2018-10-051-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'deploy-tokens' into 'master'" Closes #52228 See merge request gitlab-org/gitlab-ce!22149
| | * | | | | | | | Revert "Merge branch 'deploy-tokens' into 'master'"Stan Hu2018-10-051-2/+2
| | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3df32ac1290160680473248b48d1b12c96458bf7, reversing changes made to dd1295a30f28eeb3c7058b1899e00db7943f3e54.
| * | | | | | | | Merge branch 'scheduled-manual-jobs' into 'master'Kamil Trzciński2018-10-0533-81/+310
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delayed jobs Closes #51352 See merge request gitlab-org/gitlab-ce!21767
| | * \ \ \ \ \ \ \ Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-0531-142/+326
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Make sure remaining time of scheduled jobs is positive in pipelines listWinnie Hellmann2018-10-051-2/+7
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-0589-448/+1154
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add component tests for scheduled job frontendWinnie Hellmann2018-10-043-4/+5
| | | | | | | | | | | |
| | * | | | | | | | | | Make Ci::Stage status transition event consistent with Ci::PipelineShinya Maeda2018-10-041-2/+2
| | | | | | | | | | | |
| | * | | | | | | | | | Enable ci_enable_scheduled_build feature flag by defaultShinya Maeda2018-10-041-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Guard against missing manual actions / scheduled jobs in pipelines rowWinnie Hellmann2018-10-041-1/+8
| | | | | | | | | | | |
| | * | | | | | | | | | Display confirmation only when triggering scheduled jobs not manualWinnie Hellmann2018-10-041-5/+7
| | | | | | | | | | | |
| | * | | | | | | | | | Rename event :schedule to event :delay in Ci::Pipeline to avoid conflicts ↵Shinya Maeda2018-10-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with enum source
| | * | | | | | | | | | Revert "Avoid conflicts between enumlator's schedule! method and state ↵Shinya Maeda2018-10-043-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | machine's schedule! method" This reverts commit 10b09db46ddfdc6dfab55fa9671e716cd46a565b.
| | * | | | | | | | | | Avoid conflicts between enumlator's schedule! method and state machine's ↵Shinya Maeda2018-10-043-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | schedule! method
| | * | | | | | | | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-0478-1264/+1461
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Improve performance of stale scheduled builds searchShinya Maeda2018-10-031-28/+12
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add job_entity_specShinya Maeda2018-10-031-1/+9
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-0316-23/+97
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add confirmation for immediately starting scheduled jobsWinnie Hellmann2018-10-022-4/+14
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | enqueue in process_build_serviceShinya Maeda2018-10-021-1/+5
| | | | | | | | | | | | | |
View Lorry Controller Status