summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '28447-hybrid-repository-storages' into 'master' Sean McGivern2017-03-072-5/+1
|\
| * Update storage settings to allow extra values per shard28447-hybrid-repository-storagesAlejandro Rodríguez2017-03-032-5/+1
* | Merge branch 'siemens/gitlab-ce-feature/openid-connect'Sean McGivern2017-03-073-1/+16
|\ \
| * | Require explicit scopes on personal access tokensMarkus Koller2017-03-071-3/+4
| * | Only use API scopes for personal access tokensMarkus Koller2017-03-071-0/+10
| * | Implement OpenID Connect identity providerMarkus Koller2017-03-072-1/+5
* | | Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonat...Douwe Maan2017-03-072-9/+11
|\ \ \ | |/ / |/| |
| * | apply codestyle and implementation changes to the respective feature codepersonal_access_token_api_and_impersonation_tokenTiago Botelho2017-03-061-2/+1
| * | refactors finder and correlated codeTiago Botelho2017-03-011-4/+3
| * | applies relevant changes to the code and code structureTiago Botelho2017-02-281-11/+4
| * | add impersonation tokenSimon Vocella2017-02-281-4/+10
| * | manage personal_access_tokens through apiSimon Vocella2017-02-281-0/+5
* | | Merge branch 'feature/runner-jobs-v4-api' into 'master' Kamil Trzciński2017-03-071-0/+21
|\ \ \
| * | | Add minor refactoringfeature/runner-jobs-v4-apiTomasz Maczukin2017-03-071-4/+2
| * | | Change artifacts and cache fields to arraysTomasz Maczukin2017-03-061-2/+2
| * | | Add some fixes and refactoring after reviewTomasz Maczukin2017-03-021-10/+4
| * | | Refactor JobRequest response structureTomasz Maczukin2017-03-021-0/+29
* | | | Merge branch 'sort-builds-in-stage' into 'master' Sean McGivern2017-03-071-1/+1
|\ \ \ \
| * | | | Sort builds in stage dropdownKamil Trzcinski2017-03-071-1/+1
* | | | | Improve pipeline triggers UIKamil Trzciński2017-03-071-2/+6
|/ / / /
* | | | Merge branch 'default-kubernetes-namespace' into 'master' Sean McGivern2017-03-071-1/+1
|\ \ \ \
| * | | | Make a default namespace of Kubernetes service to contain project IDdefault-kubernetes-namespaceKamil Trzcinski2017-03-061-1/+1
* | | | | Merge branch '26371-native-emojis-v3' into 'master' Filipa Lacerda2017-03-071-1/+1
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \
| * \ \ \ \ \ 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