summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'jej/mattermost-notification-confidentiality-10-6' into ↵Douwe Maan2018-04-055-5/+24
| | | | | | | | | | 'security-10-6' [10.6] Prevent notes on confidential issues from being sent to chat See merge request gitlab/gitlabhq!2366 # Conflicts: # app/helpers/services_helper.rb
* Merge branch '44922-fix-build-metadata-creation' into 'master'Kamil Trzciński2018-04-041-0/+1
|\ | | | | | | | | | | | | Resolve "ActiveRecord::RecordNotUnique: PG::UniqueViolation: ERROR: duplicate key value violates unique constraint "index_ci_builds_meta..." Closes #44922 See merge request gitlab-org/gitlab-ce!18155
| * Create metadata object on build object creationTomasz Maczukin2018-04-041-0/+1
| |
* | Add banzai filter to detect commit message trailers and properly link the usersOmar Mekky2018-04-041-1/+2
|/
* Revert "Allow CI/CD Jobs being grouped on version strings"Zeger-Jan van de Weg2018-04-041-1/+1
| | | | This reverts commit 4f2cdb51df0f2729055ec4dc6960ae347163da16.
* Merge branch 'fix/use-shard-name-in-gitlab-projects-instead-of-shard-path' ↵Sean McGivern2018-04-041-3/+1
|\ | | | | | | | | | | | | | | | | into 'master' Use shard name in Git::GitlabProjects instead of shard path Closes gitaly#1110 See merge request gitlab-org/gitlab-ce!18015
| * Use shard name in Git::GitlabProjects instead of shard pathAhmad Sherif2018-04-031-3/+1
| | | | | | | | Closes gitaly#1110
* | [Rails5] Rename `sort` methods to `sort_by_attribute`blackst0ne2018-04-049-10/+10
| |
* | Refactor discussions/notes codeJan Provaznik2018-04-031-2/+5
| |
* | Merge branch 'feature/gb/variables-expressions-in-only-except' into 'master'Kamil Trzciński2018-04-021-43/+84
|\ \ | | | | | | | | | | | | | | | | | | Pipeline variables expression in only/except configuration Closes #37397 See merge request gitlab-org/gitlab-ce!17316
| * | Improve naming and optimize methods of the build classGrzegorz Bizon2018-03-301-2/+8
| | |
| * | Memoize environment-specific methods in build classGrzegorz Bizon2018-03-291-5/+9
| | | | | | | | | | | | | | | | | | The purpose of this memoization is to make getting persisted environment name, and related scoped variables, a little more performant task, because it can be invoked multiple times.
| * | Extract build variables that depend on persistenceGrzegorz Bizon2018-03-291-24/+31
| | |
| * | Merge branch 'master' into 'feature/gb/variables-expressions-in-only-except'Grzegorz Bizon2018-03-2919-97/+195
| |\ \ | | | | | | | | | | | | Conflicts: app/models/ci/build.rb
| * | | Add specs for method that exposes build variables hashGrzegorz Bizon2018-03-271-3/+0
| | | |
| * | | Decouple build variables from persisted environmentGrzegorz Bizon2018-03-271-28/+42
| | | |
| * | | Merge branch 'master' into feature/gb/variables-expressions-in-only-exceptGrzegorz Bizon2018-03-2737-80/+326
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (199 commits) Conflicts: lib/gitlab/ci/pipeline/seed/stage.rb
| * | | | Expose evaluable variables method from build objectGrzegorz Bizon2018-03-231-2/+13
| | | | |
| * | | | Make it possible to access static builds variablesGrzegorz Bizon2018-03-231-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to access static build variables even when an object is not persisted yet. This will allow us to evaluate build variables using only/except policies before deciding whether we actually want to persist the build in the database, or not.
* | | | | Merge branch '44291-usage-ping-for-kubernetes-integration' into 'master'Kamil Trzciński2018-04-022-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Usage ping for Kubernetes integration" Closes #44291 See merge request gitlab-org/gitlab-ce!17922
| * | | | | Extract cluster installed query to scopeMatija Čupić2018-03-301-0/+2
| | | | | |
| * | | | | Extract installed cluster application scope to concernMatija Čupić2018-03-295-8/+2
| | | | | |
| * | | | | Merge branch 'master' into 44291-usage-ping-for-kubernetes-integrationMatija Čupić2018-03-2943-164/+317
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Add installed scope to cluster applicationsMatija Čupić2018-03-294-0/+8
| | | | | |
| * | | | | Add user_provided and gcp_provided cluster scopesMatija Čupić2018-03-291-0/+2
| | | | | |
* | | | | | Extend API for exporting a project with direct upload URLFrancisco Javier López2018-03-301-2/+14
| | | | | |
* | | | | | Merge branch '41967_issue_api_closed_by_info' into 'master'Sean McGivern2018-03-301-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add closed by information to issue API See merge request gitlab-org/gitlab-ce!17042
| * | | | | | changed the way of nullifying columshaseeb2018-03-051-0/+5
| | | | | | |
| * | | | | | removed hasmany association from usershaseeb2018-02-281-1/+0
| | | | | | |
| * | | | | | added forign key and specshaseeb2018-02-281-0/+1
| | | | | | |
| * | | | | | closed by field addedhaseeb2018-02-281-0/+1
| | | | | | |
* | | | | | | Add port number to artifacts links to gitlab-pages, if neededAlessio Caiazza2018-03-292-14/+12
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'add-per-runner-job-timeout' into 'master'Kamil Trzciński2018-03-294-5/+94
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add per runner job timeout Closes #43426 See merge request gitlab-org/gitlab-ce!17221
| * | | | | | Remove Ci::Build#timeoutTomasz Maczukin2018-03-281-4/+2
| | | | | | |
| * | | | | | Add explicit primary key for ci_builds_metadata tableTomasz Maczukin2018-03-281-0/+1
| | | | | | |
| * | | | | | Change and rename behavior of save_timeout_state!Tomasz Maczukin2018-03-282-3/+3
| | | | | | |
| * | | | | | Refactorize ChronicDurationAttribute concernTomasz Maczukin2018-03-281-31/+20
| | | | | | |
| * | | | | | Refactor build_metadataTomasz Maczukin2018-03-282-13/+5
| | | | | | |
| * | | | | | Add validation for max_timeout in Ci::RunnerTomasz Maczukin2018-03-281-0/+4
| | | | | | |
| * | | | | | Add validation for chronic_duration_attr_writerTomasz Maczukin2018-03-281-4/+23
| | | | | | |
| * | | | | | Add project_id column to Ci::BuildMetadataTomasz Maczukin2018-03-281-0/+11
| | | | | | |
| * | | | | | Rename metadata relation and methodsTomasz Maczukin2018-03-281-5/+5
| | | | | | |
| * | | | | | BuildMetadata styling improvementsTomasz Maczukin2018-03-281-5/+5
| | | | | | |
| * | | | | | Rename used_timeout to timeoutTomasz Maczukin2018-03-282-3/+3
| | | | | | |
| * | | | | | Rename maximum_job_timeout to maximum_timeoutTomasz Maczukin2018-03-282-3/+3
| | | | | | |
| * | | | | | Fix tests failuresTomasz Maczukin2018-03-281-2/+2
| | | | | | |
| * | | | | | Refactorize Ci::Build and Ci::BuildMetadata modelsTomasz Maczukin2018-03-282-12/+18
| | | | | | |
| * | | | | | Fix transition failure when metadata not existsTomasz Maczukin2018-03-281-1/+1
| | | | | | |
| * | | | | | Move job timeout information to new ci_builds_metadata tableTomasz Maczukin2018-03-282-11/+32
| | | | | | |
| * | | | | | Change timeout_source to enumTomasz Maczukin2018-03-281-4/+11
| | | | | | |