summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'blackst0ne-rails5-fix-spec-models-ci-pipeline_spec-rb' into ↵Kamil Trzciński2018-05-141-1/+11
|\ | | | | | | | | | | | | | | | | 'master' Resolve "[Rails5] Fix spec/models/ci/pipeline_spec.rb" Closes #46229 See merge request gitlab-org/gitlab-ce!18906
| * [Rails5] Fix Ci::Pipeline validator for sourceblackst0ne-rails5-fix-spec-models-ci-pipeline_spec-rbblackst0ne2018-05-121-1/+11
| | | | | | | | | | | | | | | | | | In Rails 5 enum returns value instead of key. For this case, the `NilClass` is returned instead of `unknown` which breaks validation of the `source` attribute. This commit adds a custom validatior that returns the correct result for both rails4 and rails5.
* | Merge branch 'bvl-restrict-api-git-for-terms' into 'master'Douwe Maan2018-05-111-0/+5
|\ \ | |/ |/| | | | | | | | | 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/+5
| | | | | | | | | | | | 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 'dz-add-2fa-filter' into 'master'Douwe Maan2018-05-112-3/+18
|\ \ | | | | | | | | | | | | Add 2FA filter to group members page See merge request gitlab-org/gitlab-ce!18483
| * | Add 2FA filter to group members pageDmitriy Zaporozhets2018-05-102-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | * Show 2fa badge on a group members page * Make group members page UI consistent with project members page * Fix ambiguous sql in User.with/without_two_factor methods Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'blackst0ne-rails5-fix-route-source-can-t-be-blank' into 'master'Douwe Maan2018-05-111-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "[Rails5] Fix `Route source can't be blank`" Closes #46228 See merge request gitlab-org/gitlab-ce!18890
| * | | [Rails5] Fix `Route source can't be blank`blackst0ne-rails5-fix-route-source-can-t-be-blankblackst0ne2018-05-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5.0 automatic inverse does not work for polymorphic relathionships. It was fixed in Rails 5.2: https://github.com/rails/rails/pull/28808 Until that the `inverse_of: :source` argument should be set explicitly.
* | | | Merge branch 'correct-runner-type-when-assigning-shared-to-project' into ↵Kamil Trzciński2018-05-111-1/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | '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-0/+2
| | | |
| * | | Ensure runner_type is updated correctly when assigning shared runner to projectDylan Griffith2018-05-101-1/+5
| | | |
* | | | only issue a warning if column doesn't existBrett Walker2018-05-101-1/+2
| |_|/ |/| |
* | | Merge branch '45442-updates-updated-at-to-issue-on-time-spent' into 'master'Douwe Maan2018-05-101-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+6
| | |/ | |/|
* | | Merge branch 'dm-repository-xcode-project' into 'master'Robert Speicher2018-05-091-2/+8
|\ \ \ | |_|/ |/| | | | | | | | Add Repository#xcode_project? method See merge request gitlab-org/gitlab-ce!18854
| * | Add Repository#xcode_project? methodDouwe Maan2018-05-091-2/+8
| | |
* | | Add validation Ci::Runner runner_type must be presentDylan Griffith2018-05-091-0/+1
|/ /
* | Set `runner_type` for cluster/applicationKamil Trzciński2018-05-091-1/+9
|/
* Merge branch 'dm-ensure-import-state-persisted' into 'master'Grzegorz Bizon2018-05-081-2/+8
|\ | | | | | | | | Don't create import_state until project is persisted See merge request gitlab-org/gitlab-ce!18803
| * Don't create import_state until project is persistedDouwe Maan2018-05-081-2/+8
| |
* | Update commit status from external CI services less aggressivelyNick Thomas2018-05-081-7/+10
|/
* Backport: Keep ShaAttribute from halting startup when we can’t connect to ↵Brett Walker2018-05-081-7/+22
| | | | a database
* Merge branch 'dm-project-factory-import-state' into 'master'Robert Speicher2018-05-071-18/+18
|\ | | | | | | | | | | | | Fix project factory `import_*` traits Closes gitlab-ee#5904 See merge request gitlab-org/gitlab-ce!18780
| * Force creation of new import_state when setting an import state fieldDouwe Maan2018-05-071-18/+18
| |
* | Merge branch '43557-osw-present-merge-sha-commit' into 'master'Robert Speicher2018-05-071-0/+4
|\ \ | | | | | | | | | | | | | | | | | | 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/+4
| | |
* | | Merge branch '5480-epic-notifications-ce' into 'master'Douwe Maan2018-05-072-6/+2
|\ \ \ | | | | | | | | | | | | | | | | Backport 5480-epic-notifications from EE See merge request gitlab-org/gitlab-ce!18724
| * | | Backport 5480-epic-notifications from EEMario de la Ossa2018-05-072-6/+2
| | |/ | |/|
* | | Resolve "Inform users of up to $500 offer for GCP account"Dennis Tang2018-05-071-1/+2
| | |
* | | Merge branch 'ccr/weight_1481' into 'master'Douwe Maan2018-05-071-1/+5
|\ \ \ | | | | | | | | | | | | | | | | Backport of 1481-changing-weight-values-should-trigger-system-notes See merge request gitlab-org/gitlab-ce!18699
| * | | Backport of 1481-changing-weight-values-should-trigger-system-notesChantal Rollison2018-05-031-1/+5
| | | |
* | | | Merge branch 'add-git-commit-message-predefined-variable' into 'master'Grzegorz Bizon2018-05-071-4/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CI_COMMIT_MESSAGE, CI_COMMIT_TITLE and CI_COMMIT_DESCRIPTION predefined variables Closes #20400 See merge request gitlab-org/gitlab-ce!18672
| * | | | Add memoization of commit related values in Ci::PipelineTomasz Maczukin2018-05-071-6/+18
| | | | |
| * | | | Add a CI_COMMIT_MESSAGE predefined variableTomasz Maczukin2018-05-071-0/+11
| | | | |
* | | | | Merge branch '42099-port-push-mirroring-to-ce-ce-port-v-2' into 'master'Douwe Maan2018-05-074-2/+277
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | CE backport of Backports Push Mirrors to CE Closes #42099 See merge request gitlab-org/gitlab-ce!18715
| * | | | Adds changelog entry, changes RemoteMirror#sync? to be semantically sound ↵Tiago Botelho2018-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | and remove reference to pull mirrors in view
| * | | | Adds remote mirror table migrationTiago Botelho2018-05-074-5/+9
| | | | |
| * | | | Backports every CE related change from ee-5484 to CETiago Botelho2018-05-073-0/+271
| | | | |
* | | | | Merge branch 'live-trace-v2-efficient-destroy-all' into 'master'Grzegorz Bizon2018-05-074-17/+136
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-0713-73/+303
| |\ \ \ \ \
| * | | | | | Use prepend: true to evaluate always perform_fast_destroy than dependent: ↵Shinya Maeda2018-05-042-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | :destroy
| * | | | | | Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-allShinya Maeda2018-05-043-6/+13
| |\ \ \ \ \ \
| * | | | | | | Fix typo in fast_destroy_allShinya Maeda2018-05-031-1/+1
| | | | | | | |
| * | | | | | | Simplify FastDestroyAll moduleShinya Maeda2018-05-032-47/+60
| | | | | | | |
| * | | | | | | Fix typo for comments in project.rbShinya Maeda2018-05-031-1/+1
| | | | | | | |
| * | | | | | | Fix typo for comments in fast_destroy_allShinya Maeda2018-05-031-1/+1
| | | | | | | |
| * | | | | | | Clean up build_trace_chunkShinya Maeda2018-05-032-9/+10
| | | | | | | |
| * | | | | | | Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-allShinya Maeda2018-05-038-7/+154
| |\ \ \ \ \ \ \
| * | | | | | | | Fix static analysysShinya Maeda2018-05-021-2/+2
| | | | | | | | |
| * | | | | | | | Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-allShinya Maeda2018-05-021-1/+1
| |\ \ \ \ \ \ \ \
View Lorry Controller Status