summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 'rs-carrierwave-db'rs-carrierwave-dbDouwe Maan2017-03-063-0/+16
|\
| * Merge branch 'zj-create-mattermost-team' into 'master' Kamil Trzciński2017-03-063-0/+16
| |\
| | * Merge branch 'master' into 'zj-create-mattermost-team'Zeger-Jan van de Weg2017-03-063-3/+22
| | |\
| | * \ 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
| | * | | | | | 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
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into pipeline-blocking-actionspipeline-blocking-actionsGrzegorz Bizon2017-03-063-3/+22
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | 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 'mas...Sean McGivern2017-03-061-0/+13
|\ \ \ \ \ \ \
| * | | | | | | 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 JIRASean McGivern2017-03-061-0/+5
* | | | | | | Merge branch 'introduce-pipeline-triggers' into 'master' Sean McGivern2017-03-062-3/+9
|\ \ \ \ \ \ \
| * | | | | | | 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
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'etag-notes-polling' into 'master' Sean McGivern2017-03-061-0/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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 viewdz-change-project-viewDmitriy Zaporozhets2017-03-031-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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 subtle MR mege button until CI status is available28010-mr-merge-button-default-to-dangerEric Eastwood2017-03-021-1/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'dm-fix-api-create-file-on-empty-repo' into 'master' Robert Speicher2017-03-021-0/+2
|\ \ \ \ \ \
| * | | | | | Fix creating a file in an empty repo using the APIDouwe Maan2017-03-011-0/+2
* | | | | | | Merge branch 'fix-build-mock-ci-service' into 'master' Douwe Maan2017-03-021-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Add missing association for mock_ci_servicefix-build-mock-ci-serviceAdam Niedzielski2017-03-021-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Override setters so it also accepts string visibility levels27501-api-use-visibility-everywhereToon Claes2017-03-021-0/+16
View Lorry Controller Status