summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Remove the User#is_admin? methodblackst0ne2017-04-091-2/+2
* Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-077-268/+100
|\
| * Merge branch 'bvl-fix-project-ci-status-cache' into 'master' Kamil Trzciński2017-04-073-188/+2
| |\
| | * Use `Ci::ExpirePipelineCacheService` to set `ProjectPipelinestatus`bvl-fix-project-ci-status-cacheBob Van Landuyt2017-04-071-12/+1
| | * Rename `ProjectBuildStatus` -> `ProjectPipelineStatus`Bob Van Landuyt2017-04-072-2/+2
| | * Wrap updating of cache after pipeline transition in class methodBob Van Landuyt2017-04-071-6/+2
| | * Update project build status cache when transitioningBob Van Landuyt2017-04-071-3/+4
| | * Rename Ci::PipelineStatus -> Ci::ProjectBuildStatusBob Van Landuyt2017-04-073-176/+4
| * | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-075-80/+98
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0619-490/+1623
| | |\
| | * \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-061-1/+21
| | |\ \
| | * | | Protected Tags backend review changesJames Edwards-Jones2017-04-062-2/+1
| | * | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0622-130/+492
| | |\ \ \
| | * | | | Moved Project#protected_branch? to ProtectedBranch, similar for tagsJames Edwards-Jones2017-04-033-57/+57
| | * | | | Extracted ProtectableDropdown to clean up Project#open_branchesJames Edwards-Jones2017-04-032-19/+24
| | * | | | Extract ProtectedRef ConcernJames Edwards-Jones2017-04-031-4/+4
| | * | | | Protected tags copy/paste from protected branchesJames Edwards-Jones2017-03-311-0/+14
* | | | | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-071-12/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '30056-rename-milestones-empty' into 'master'Robert Speicher2017-04-071-12/+0
| |\ \ \ \ \
| | * | | | | Removed `Milestone#is_empty?`Jacopo2017-04-071-12/+0
| | | |_|/ / | | |/| | |
* | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-076-36/+90
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '8998_skip_pending_commits_if_not_head' into 'master' Kamil Trzciński2017-04-073-0/+79
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-0710-266/+873
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-0712-260/+753
| | |\ \ \ \ \ \
| | * | | | | | | Make sure that's canceledLin Jen-Shin2017-04-071-1/+1
| | * | | | | | | Fix typoLin Jen-Shin2017-04-071-1/+1
| | * | | | | | | Add missing tests and update test descriptionLin Jen-Shin2017-04-062-0/+2
| | * | | | | | | Also track auto-cancelling in jobs, detail:Lin Jen-Shin2017-04-062-0/+63
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-061-1/+21
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-063-22/+79
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Add tests for relations and scopes, and settingLin Jen-Shin2017-04-062-0/+14
| * | | | | | | | Use Etag caching for pipelines jsonToon Claes2017-04-061-0/+8
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'optimise-pipelines' into 'master' Douwe Maan2017-04-063-36/+3
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Merge remote-tracking branch 'origin/master' into optimise-pipelinesoptimise-pipelinesKamil Trzcinski2017-04-0614-282/+852
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Fix tests and reviewKamil Trzcinski2017-04-061-0/+1
| | * | | | | | Fix token test by specifying a static tokenLin Jen-Shin2017-04-071-2/+2
| | * | | | | | We no longer has has_command? methodLin Jen-Shin2017-04-061-34/+0
| | | |/ / / / | | |/| | | |
* | | | | | | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-0619-490/+1623
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'microsoft-teams-integration' into 'master' Douwe Maan2017-04-068-230/+870
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | adds relevant testsTiago Botelho2017-04-068-230/+870
| * | | | | | Merge branch '2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-imple...Kamil Trzciński2017-04-062-0/+77
| |\ \ \ \ \ \
| | * | | | | | Improve trigger_schedule.rbShinya Maeda2017-04-061-6/+62
| | * | | | | | Use parenthesis for respond_to :refShinya Maeda2017-04-061-1/+1
| | * | | | | | Define next_time as let in trigger_schedule_specShinya Maeda2017-04-061-1/+1
| | * | | | | | Remove next_run_at: nil from trigger_schedule_specShinya Maeda2017-04-061-1/+1
| | * | | | | | Rename cron_time_zone to cron_timezone. Separate add_concurrent_foreign_key.Shinya Maeda2017-04-061-1/+1
| | * | | | | | Rename cron_nightly_build to nightlyShinya Maeda2017-04-061-1/+1
| | * | | | | | Move Ci::CronParser to Gitlab::Ci::CronParserShinya Maeda2017-04-061-1/+1
| | * | | | | | Add Import/Export Setting for trigger_schedule. Remove ref validation.Shinya Maeda2017-04-061-7/+0
| | * | | | | | Commentout check_cron_frequencyShinya Maeda2017-04-061-26/+1