summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Rename BUILD to JOB in CI Variableszj-variables-build-jobZ.J. van de Weg2017-03-071-7/+30
| | | | | | | | Given GitLab moves away from using the term build, everywhere, also the CI variables are being renamed. For now, both `CI_BUILD_X` and `CI_JOB_X` are supported, with the same values. However, in about 3 months, support will be dropped.
* Merge branch '26371-native-emojis-v3' into 'master' Filipa Lacerda2017-03-071-1/+1
|\ | | | | | | | | | | | | Add emoji images - Base Native Unicode Emojis Closes #26371 See merge request !9569
| * Fix up @DouweM reviewEric Eastwood2017-03-061-1/+1
| |
* | Merge branch 'use-publish-to-post-notifications' into 'master' Rémy Coutable2017-03-071-8/+5
|\ \ | | | | | | | | | | | | Use publish channel to post notifications changes See merge request !9574
| * | Update notification codeKamil Trzcinski2017-03-061-6/+4
| | |
| * | Add support for Workhorse notificationsKamil Trzcinski2017-03-031-6/+5
| | |
* | | Merge branch 'master' into 'rs-carrierwave-db'rs-carrierwave-dbDouwe Maan2017-03-063-0/+16
|\ \ \ | | | | | | | | | | | | # Conflicts: # spec/models/group_spec.rb
| * \ \ Merge branch 'zj-create-mattermost-team' into 'master' Kamil Trzciński2017-03-063-0/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create Mattermost Team from GitLab Closes #23964 See merge request !8746
| | * \ \ Merge branch 'master' into 'zj-create-mattermost-team'Zeger-Jan van de Weg2017-03-063-3/+22
| | |\ \ \ | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | * \ \ \ Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-03-068-22/+52
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-03-0216-250/+276
| | |\ \ \ \ \
| | * | | | | | Improve UXZ.J. van de Weg2017-03-021-0/+10
| | | | | | | |
| | * | | | | | Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-02-2447-190/+185
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-02-2013-64/+73
| | |\ \ \ \ \ \ \
| | * | | | | | | | Transactional mattermost team creationZ.J. van de Weg2017-02-202-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this commit, but still on this feature branch, the creation of mattermost teams where a background job. However, it was decided it was better that these happened as transaction so feedback could be displayed to the user.
| | * | | | | | | | Add tests for Mattermost team creationZ.J. van de Weg2017-02-161-0/+5
| | | | | | | | | |
| | * | | | | | | | Create MM team for GitLab groupZ.J. van de Weg2017-02-161-0/+1
| | | | | | | | | |
* | | | | | | | | | Add `has_many` associations for models that can have Upload recordsRobert Speicher2017-03-064-0/+4
| | | | | | | | | |
* | | | | | | | | | Add Upload model and UploadChecksumWorker workerRobert Speicher2017-03-061-0/+63
|/ / / / / / / / /
* | | | | | | | | Merge branch 'pipeline-blocking-actions' into 'master' Kamil Trzciński2017-03-064-23/+45
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make manual actions blocking Closes #26360 and #22628 See merge request !9585
| * | | | | | | | Merge branch 'master' into pipeline-blocking-actionspipeline-blocking-actionsGrzegorz Bizon2017-03-063-3/+22
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits) Fix UserBasic Rename `/take` to `/take_ownership`, expose `owner` in `v3`. Update after review Fix values being called at Array instead of Hash Fix json response in branches controller Improve docs and specs related to pages artifacts Add MR fo changelog about removing pages artifacts Delete artifacts for pages unless expiry date is specified Lint doc Improved team selection Move foreign key to separate migration Fix import model attributes Update documentation and expose ID Introduce tests for pipeline triggers Fix trigger model Update db/schema Make triggers to be user aware Make Pipeline Triggers to be user aware Update triggers API Remove remnants of git annex ... Conflicts: db/schema.rb
| * | | | | | | | Ignore optional actions when calculating warningsGrzegorz Bizon2017-03-061-2/+4
| | | | | | | | |
| * | | | | | | | Fix invalid description in commit status specsGrzegorz Bizon2017-03-061-1/+1
| | | | | | | | |
| * | | | | | | | Remove unused method that describes blocking jobGrzegorz Bizon2017-03-061-4/+0
| | | | | | | | |
| * | | | | | | | Extend specs for pipelines with manual blocking actionsGrzegorz Bizon2017-03-061-0/+4
| | | | | | | | |
| * | | | | | | | Fix specs for detailed statuses for manual actionsGrzegorz Bizon2017-03-061-2/+2
| | | | | | | | |
| * | | | | | | | Reinstitute a core `manual` status for manual actionsGrzegorz Bizon2017-03-064-24/+24
| | | | | | | | |
| * | | | | | | | Add support for blocking actions to CI/CD pipelineGrzegorz Bizon2017-03-063-3/+9
| | | | | | | | |
| * | | | | | | | Fix Rubocop offense in CI/CD build state machineGrzegorz Bizon2017-03-061-1/+1
| | | | | | | | |
| * | | | | | | | Refactor code related to pipeline blocking actionsGrzegorz Bizon2017-03-063-22/+28
| | | | | | | | |
| * | | | | | | | Fix lambda operatorKamil Trzcinski2017-03-061-1/+1
| | | | | | | | |
| * | | | | | | | Make manual actions blockingKamil Trzcinski2017-03-063-13/+21
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '27520-option-to-prevent-signing-in-from-multiple-ips' into ↵Sean McGivern2017-03-061-0/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' GitLab should have an option to prevent users from signing in from multiple IPs Closes #27520 See merge request !8998
| * | | | | | | | Add admin settings entriesPawel Chojnacki2017-03-061-0/+10
| | | | | | | | |
| * | | | | | | | Allow limiting logging in users from too many different IPs.Pawel Chojnacki2017-03-061-0/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-mentioned-issues-for-external-trackers' into 'master' Sean McGivern2017-03-061-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issues mentioned but not closed for JIRA Closes #26028 See merge request !9687
| * | | | | | | Fix issues mentioned but not closed for JIRASean McGivern2017-03-061-0/+5
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ReferenceExtractor` would return an array of `ExternalIssue` objects, and then perform `Array#-` to remove the issues closed. `ExternalIssue`s had `==` defined, but not `hash` or `eql?`, which are used by `Array#-`.
* | | | | | | Merge branch 'introduce-pipeline-triggers' into 'master' Sean McGivern2017-03-062-3/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve pipeline triggers API See merge request !9713
| * | | | | | | Fix trigger modelKamil Trzcinski2017-03-051-1/+0
| | | | | | | |
| * | | | | | | Make triggers to be user awareKamil Trzcinski2017-03-051-0/+1
| | | | | | | |
| * | | | | | | Make Pipeline Triggers to be user awareKamil Trzcinski2017-03-051-3/+9
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - they can have owner, - they can be edited, - they have description, - you can take ownership of them
* | | | | | | Merge branch 'etag-notes-polling' into 'master' Sean McGivern2017-03-061-0/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ETag to improve performance of issue notes polling Closes #27582 See merge request !9036
| * | | | | | Invalidate ETag cache when note changesAdam Niedzielski2017-03-011-0/+13
| | | | | | |
* | | | | | | Merge branch 'dz-change-project-view' into 'master' Dmitriy Zaporozhets2017-03-041-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change default project view for user from readme to files view See merge request !9584
| * | | | | | | Change default project view for user from readme to files viewdz-change-project-viewDmitriy Zaporozhets2017-03-031-0/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEMNick Thomas2017-03-031-1/+6
| | | | | | |
* | | | | | | Merge branch 'dm-fix-cherry-pick' into 'master' Robert Speicher2017-03-031-16/+17
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cherry-picking or reverting through an MR Closes #28711 and #28426 See merge request !9640
| * | | | | | Use separate error class for cherry-pick and revert tree errorsDouwe Maan2017-03-021-2/+3
| | | | | | |
| * | | | | | Fix cherry-picking or reverting through an MRDouwe Maan2017-03-021-16/+16
| | | | | | |
* | | | | | | Merge branch '28010-mr-merge-button-default-to-danger' into 'master' Alfredo Sumaran2017-03-031-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to dangerous MR merge button Closes #28010 See merge request !9245
View Lorry Controller Status