summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Makes CommitStatus and GenericCommitStatus respond to presentableMayra Cabrera2018-05-151-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods Includes Presentable module into CommitStatus. This fixes presenter methods being called on those classes. Closes #46177
* | | | Resolve "Opening Project with invite but without accepting leads to 404 ↵🙈 jacopo beschi 🙉2018-05-171-0/+18
| | | | | | | | | | | | | | | | error page"
* | | | Merge branch 'zj-workhorse-commit-patch-diff' into 'master'Grzegorz Bizon2018-05-171-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workhorse to send raw diff and patch for commits Closes gitaly#1196 See merge request gitlab-org/gitlab-ce!18974
| * | | | Workhorse to send raw diff and patch for commitsZeger-Jan van de Weg2018-05-161-1/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, this was done through unicorn. In theory this could time out. Workhorse has been sending these raw patches and diffs for a long time and is stable in doing so. Added bonus is the fact that `Commit#to_patch` can be removed. `Commit#to_diff` too, which closes https://gitlab.com/gitlab-org/gitaly/issues/324 Closes https://gitlab.com/gitlab-org/gitaly/issues/1196
* | | | Merge branch 'jprovazn-remote-upload-destroy' into 'master'Kamil Trzciński2018-05-164-4/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete remote uploads Closes #45425 See merge request gitlab-org/gitlab-ce!18698
| * | | | Delete remote uploadsJan Provaznik2018-05-164-4/+36
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ObjectStore uploader requires presence of associated `uploads` record when deleting the upload file (through the carrierwave's after_commit hook) because we keep info whether file is LOCAL or REMOTE in `upload` object. For this reason we can not destroy uploads as "dependent: :destroy" hook because these would be deleted too soon. Instead we rely on carrierwave's hook to destroy `uploads` in after_commit hook. But in before_destroy hook we still have to delete not-mounted uploads (which don't use carrierwave's destroy hook). This has to be done in before_Destroy instead of after_commit because `FileUpload` requires existence of model's object on destroy action. This is not ideal state of things, in a next step we should investigate how to unify model dependencies so we can use same workflow for all uploads. Related to #45425
* | | | Merge branch '46010-allow-managing-group-runners-via-api' into 'master'Kamil Trzciński2018-05-162-65/+69
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API support + Improved policies for group runners Closes #45894 and #38979 See merge request gitlab-org/gitlab-ce!18851
| * | | | Rename User#ci_authorized_runners -> ci_owned_runnersDylan Griffith2018-05-161-7/+7
| | | | |
| * | | | Allow group runners to be viewed/edited in APIDylan Griffith2018-05-162-62/+66
| |/ / /
* | | | Merge branch 'zj-add-branch-mandatory' into 'master'Douwe Maan2018-05-161-54/+14
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Move Gitlab::Git::Repository#add_branch to mandatory Closes gitaly#540 See merge request gitlab-org/gitlab-ce!18939
| * | | Move Gitlab::Git::Repository#add_branch to mandatoryZeger-Jan van de Weg2018-05-141-54/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, a feature flag could be used to disable this feature. Now all requests go through Gitaly's OperationService. Closes https://gitlab.com/gitlab-org/gitaly/issues/540 When vendoring `Gitlab::Git` again in Gitaly, this implemenation will be gone, but this is readded there through: https://gitlab.com/gitlab-org/gitaly/merge_requests/717
* | | Merge branch 'sh-enforce-unique-and-not-null-project-ids-project-features' ↵Yorick Peterse2018-05-151-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add a unique and not null constraint on the project_features.project_id column Closes #37882 See merge request gitlab-org/gitlab-ce!18925
| * | | Add a unique and not null constraint on the project_features.project_id columnStan Hu2018-05-151-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit has two migrations: 1. The first prunes duplicate rows in the project_features table and leaves the row with the highest ID. Since the behavior was indeterministic before and depended on which row the database decided to use, this change at least makes the permissions consistent. For example, in some cases, the Wiki may have been disabled but enabled in another entry. 2. The second adds a non-null constraint on the project_features.project_id column. Closes #37882 Fixes a significant part of gitlab-com/migration#408. We found that we were overcounting Wikis because of these duplicates. On GitLab.com, there are 56 rows with duplicate entries by project_id, and 16,661 rows with NULL project_id values.
* | | Does not log failed sign-in attempts when database is in read-only modeDouglas Barbosa Alexandre2018-05-141-0/+14
|/ /
* | Merge branch 'bvl-restrict-api-git-for-terms' into 'master'Douwe Maan2018-05-111-0/+27
|\ \ | | | | | | | | | | | | | | | | | | Block access to API & git when terms are enforced Closes #45849 See merge request gitlab-org/gitlab-ce!18816
| * | Block access to API & git when terms are enforcedBob Van Landuyt2018-05-101-0/+27
| | | | | | | | | | | | | | | | | | When terms are enforced, but the user has not accepted the terms access to the API & git is rejected with a message directing the user to the web app to accept the terms.
* | | Merge branch ↵Kamil Trzciński2018-05-112-8/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'ce-5911-extract-ee-specific-files-lines-for-spec-models-clusters' into 'master' Backport EE specific cluster spec changes to CE See merge request gitlab-org/gitlab-ce!18866
| * | | Backport CE changes from gitlab-ee#518a29073a9Matija Čupić2018-05-101-2/+2
| | | |
| * | | Stub deployments in Clusters::Platforms::Kubernetes specMatija Čupić2018-05-101-1/+4
| | | |
| * | | Backport EE runner spec changes to CEMatija Čupić2018-05-101-5/+1
| | |/ | |/|
* | | Merge branch 'correct-runner-type-when-assigning-shared-to-project' into ↵Kamil Trzciński2018-05-111-6/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Ensure runner_type is updated correctly when assigning shared runner to project See merge request gitlab-org/gitlab-ce!18874
| * | | Ensure Ci::Runner#assign_to errors for group runnerscorrect-runner-type-when-assigning-shared-to-projectDylan Griffith2018-05-101-7/+20
| | | |
| * | | Ensure runner_type is updated correctly when assigning shared runner to projectDylan Griffith2018-05-101-0/+1
| | | |
* | | | Merge branch 'bw-fix-sha-attribute' into 'master'Stan Hu2018-05-101-4/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | ShaAttribute crashes with ArgumentError if column doesn't exist See merge request gitlab-org/gitlab-ce!18880
| * | | only issue a warning if column doesn't existBrett Walker2018-05-101-4/+6
| | | |
* | | | Merge branch 'fix/wiki-find-page-invalid-encoding' into 'master'Robert Speicher2018-05-101-0/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix finding wiki pages when they have invalidly-encoded content Closes #43715 See merge request gitlab-org/gitlab-ce!18856
| * | | Fix finding wiki pages when they have invalidly-encoded contentAhmad Sherif2018-05-091-0/+11
| |/ / | | | | | | | | | Fixes #43715
* | | Merge branch '45442-updates-updated-at-to-issue-on-time-spent' into 'master'Douwe Maan2018-05-101-3/+15
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Resolve "Update `updated_at` on an issue when label or time spent was added" Closes #45442 See merge request gitlab-org/gitlab-ce!18757
| * | Updates updated_at on issue when using /spend quick actionJacopo2018-05-091-3/+15
| | |
* | | Merge branch 'dm-repository-xcode-project' into 'master'Robert Speicher2018-05-091-1/+32
|\ \ \ | |_|/ |/| | | | | | | | Add Repository#xcode_project? method See merge request gitlab-org/gitlab-ce!18854
| * | Add Repository#xcode_project? methodDouwe Maan2018-05-091-1/+32
| | |
* | | Add validation Ci::Runner runner_type must be presentDylan Griffith2018-05-091-0/+1
|/ /
* | Merge branch 'add-runner-type-to-cluster-app' into 'master'Grzegorz Bizon2018-05-091-2/+1
|\ \ | | | | | | | | | | | | Set `runner_type` for cluster/application See merge request gitlab-org/gitlab-ce!18832
| * | Set `runner_type` for cluster/applicationKamil Trzciński2018-05-091-2/+1
| |/
* | Merge branch '46010-add-missing-parens' into 'master'Kamil Trzciński2018-05-082-25/+25
|\ \ | |/ |/| | | | | Add missing parens to make consistent in project_spec and runner_spec See merge request gitlab-org/gitlab-ce!18808
| * Add some missing parens in project_spec and runner_specDylan Griffith2018-05-082-25/+25
| |
* | Removes RemoteMirror related TODO from project_specTiago Botelho2018-05-081-2/+0
|/
* Update commit status from external CI services less aggressivelyNick Thomas2018-05-081-7/+15
|
* Backport: Keep ShaAttribute from halting startup when we can’t connect to ↵Brett Walker2018-05-081-13/+54
| | | | a database
* Merge branch '43557-osw-present-merge-sha-commit' into 'master'Robert Speicher2018-05-071-0/+16
|\ | | | | | | | | | | | | Resolve "Display merge commit SHA in merge widget after merge" Closes #43557 See merge request gitlab-org/gitlab-ce!18722
| * Display merge commit SHA in merge widget after mergeOswaldo Ferreira2018-05-071-0/+16
| |
* | Merge branch 'add-git-commit-message-predefined-variable' into 'master'Grzegorz Bizon2018-05-072-2/+5
|\ \ | | | | | | | | | | | | | | | | | | Add CI_COMMIT_MESSAGE, CI_COMMIT_TITLE and CI_COMMIT_DESCRIPTION predefined variables Closes #20400 See merge request gitlab-org/gitlab-ce!18672
| * | Add a CI_COMMIT_MESSAGE predefined variableTomasz Maczukin2018-05-072-2/+5
| | |
* | | Merge branch '42099-port-push-mirroring-to-ce-ce-port-v-2' into 'master'Douwe Maan2018-05-073-0/+383
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE backport of Backports Push Mirrors to CE Closes #42099 See merge request gitlab-org/gitlab-ce!18715
| * | | Adds remote mirror table migrationTiago Botelho2018-05-073-9/+6
| | | |
| * | | Backports every CE related change from ee-5484 to CETiago Botelho2018-05-073-0/+386
| | | |
* | | | Bump Gitaly to 0.98.0Zeger-Jan van de Weg2018-05-074-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | Hooks were run for wikis, but given the internal API wasn't responding failures happended, as seen on: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18693
* | | | Merge branch 'live-trace-v2-efficient-destroy-all' into 'master'Grzegorz Bizon2018-05-071-0/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Live trace: Use efficient destroy all (for `dependent: :destory` problem) See merge request gitlab-org/gitlab-ce!18575
| * \ \ \ Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-allShinya Maeda2018-05-076-41/+392
| |\ \ \ \
| * | | | | Added shared exmaple for fast_destroy_all concernShinya Maeda2018-05-042-69/+15
| | | | | |