Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jej/mattermost-notification-confidentiality-10-6' into ↵ | Douwe Maan | 2018-04-05 | 5 | -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ński | 2018-04-04 | 1 | -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 creation | Tomasz Maczukin | 2018-04-04 | 1 | -0/+1 |
| | | |||||
* | | Add banzai filter to detect commit message trailers and properly link the users | Omar Mekky | 2018-04-04 | 1 | -1/+2 |
|/ | |||||
* | Revert "Allow CI/CD Jobs being grouped on version strings" | Zeger-Jan van de Weg | 2018-04-04 | 1 | -1/+1 |
| | | | | This reverts commit 4f2cdb51df0f2729055ec4dc6960ae347163da16. | ||||
* | Merge branch 'fix/use-shard-name-in-gitlab-projects-instead-of-shard-path' ↵ | Sean McGivern | 2018-04-04 | 1 | -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 path | Ahmad Sherif | 2018-04-03 | 1 | -3/+1 |
| | | | | | | | | Closes gitaly#1110 | ||||
* | | [Rails5] Rename `sort` methods to `sort_by_attribute` | blackst0ne | 2018-04-04 | 9 | -10/+10 |
| | | |||||
* | | Refactor discussions/notes code | Jan Provaznik | 2018-04-03 | 1 | -2/+5 |
| | | |||||
* | | Merge branch 'feature/gb/variables-expressions-in-only-except' into 'master' | Kamil Trzciński | 2018-04-02 | 1 | -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 class | Grzegorz Bizon | 2018-03-30 | 1 | -2/+8 |
| | | | |||||
| * | | Memoize environment-specific methods in build class | Grzegorz Bizon | 2018-03-29 | 1 | -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 persistence | Grzegorz Bizon | 2018-03-29 | 1 | -24/+31 |
| | | | |||||
| * | | Merge branch 'master' into 'feature/gb/variables-expressions-in-only-except' | Grzegorz Bizon | 2018-03-29 | 19 | -97/+195 |
| |\ \ | | | | | | | | | | | | | Conflicts: app/models/ci/build.rb | ||||
| * | | | Add specs for method that exposes build variables hash | Grzegorz Bizon | 2018-03-27 | 1 | -3/+0 |
| | | | | |||||
| * | | | Decouple build variables from persisted environment | Grzegorz Bizon | 2018-03-27 | 1 | -28/+42 |
| | | | | |||||
| * | | | Merge branch 'master' into feature/gb/variables-expressions-in-only-except | Grzegorz Bizon | 2018-03-27 | 37 | -80/+326 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (199 commits) Conflicts: lib/gitlab/ci/pipeline/seed/stage.rb | ||||
| * | | | | Expose evaluable variables method from build object | Grzegorz Bizon | 2018-03-23 | 1 | -2/+13 |
| | | | | | |||||
| * | | | | Make it possible to access static builds variables | Grzegorz Bizon | 2018-03-23 | 1 | -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ński | 2018-04-02 | 2 | -0/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Usage ping for Kubernetes integration" Closes #44291 See merge request gitlab-org/gitlab-ce!17922 | ||||
| * | | | | | Extract cluster installed query to scope | Matija Čupić | 2018-03-30 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Extract installed cluster application scope to concern | Matija Čupić | 2018-03-29 | 5 | -8/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into 44291-usage-ping-for-kubernetes-integration | Matija Čupić | 2018-03-29 | 43 | -164/+317 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | Add installed scope to cluster applications | Matija Čupić | 2018-03-29 | 4 | -0/+8 |
| | | | | | | |||||
| * | | | | | Add user_provided and gcp_provided cluster scopes | Matija Čupić | 2018-03-29 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | Extend API for exporting a project with direct upload URL | Francisco Javier López | 2018-03-30 | 1 | -2/+14 |
| | | | | | | |||||
* | | | | | | Merge branch '41967_issue_api_closed_by_info' into 'master' | Sean McGivern | 2018-03-30 | 1 | -0/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add closed by information to issue API See merge request gitlab-org/gitlab-ce!17042 | ||||
| * | | | | | | changed the way of nullifying colums | haseeb | 2018-03-05 | 1 | -0/+5 |
| | | | | | | | |||||
| * | | | | | | removed hasmany association from users | haseeb | 2018-02-28 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | added forign key and specs | haseeb | 2018-02-28 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | closed by field added | haseeb | 2018-02-28 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Add port number to artifacts links to gitlab-pages, if needed | Alessio Caiazza | 2018-03-29 | 2 | -14/+12 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge branch 'add-per-runner-job-timeout' into 'master' | Kamil Trzciński | 2018-03-29 | 4 | -5/+94 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add per runner job timeout Closes #43426 See merge request gitlab-org/gitlab-ce!17221 | ||||
| * | | | | | | Remove Ci::Build#timeout | Tomasz Maczukin | 2018-03-28 | 1 | -4/+2 |
| | | | | | | | |||||
| * | | | | | | Add explicit primary key for ci_builds_metadata table | Tomasz Maczukin | 2018-03-28 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Change and rename behavior of save_timeout_state! | Tomasz Maczukin | 2018-03-28 | 2 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Refactorize ChronicDurationAttribute concern | Tomasz Maczukin | 2018-03-28 | 1 | -31/+20 |
| | | | | | | | |||||
| * | | | | | | Refactor build_metadata | Tomasz Maczukin | 2018-03-28 | 2 | -13/+5 |
| | | | | | | | |||||
| * | | | | | | Add validation for max_timeout in Ci::Runner | Tomasz Maczukin | 2018-03-28 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | Add validation for chronic_duration_attr_writer | Tomasz Maczukin | 2018-03-28 | 1 | -4/+23 |
| | | | | | | | |||||
| * | | | | | | Add project_id column to Ci::BuildMetadata | Tomasz Maczukin | 2018-03-28 | 1 | -0/+11 |
| | | | | | | | |||||
| * | | | | | | Rename metadata relation and methods | Tomasz Maczukin | 2018-03-28 | 1 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | BuildMetadata styling improvements | Tomasz Maczukin | 2018-03-28 | 1 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | Rename used_timeout to timeout | Tomasz Maczukin | 2018-03-28 | 2 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Rename maximum_job_timeout to maximum_timeout | Tomasz Maczukin | 2018-03-28 | 2 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Fix tests failures | Tomasz Maczukin | 2018-03-28 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Refactorize Ci::Build and Ci::BuildMetadata models | Tomasz Maczukin | 2018-03-28 | 2 | -12/+18 |
| | | | | | | | |||||
| * | | | | | | Fix transition failure when metadata not exists | Tomasz Maczukin | 2018-03-28 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Move job timeout information to new ci_builds_metadata table | Tomasz Maczukin | 2018-03-28 | 2 | -11/+32 |
| | | | | | | | |||||
| * | | | | | | Change timeout_source to enum | Tomasz Maczukin | 2018-03-28 | 1 | -4/+11 |
| | | | | | | |