summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-077-113/+222
|\
| * Merge branch 'adam-finish-5993-closed-issuable' into 'master' Douwe Maan2017-04-077-113/+222
| |\
| | * Add indication for closed or merged issuables in GFMadam-finish-5993-closed-issuableAdam Buckland2017-04-077-113/+222
* | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-077-23/+359
|\ \ \ | |/ /
| * | Merge branch 'dosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea...Sean McGivern2017-04-071-0/+2
| |\ \ | | |/ | |/|
| | * Add ref and active to import/export configSean McGivern2017-04-071-0/+2
| * | Merge branch 'bvl-fix-project-ci-status-cache' into 'master' Kamil Trzciński2017-04-071-0/+190
| |\ \
| | * | Take the ref of a pipeline into account when caching statusBob Van Landuyt2017-04-071-8/+11
| | * | Rename `ProjectBuildStatus` -> `ProjectPipelineStatus`Bob Van Landuyt2017-04-071-1/+1
| | * | Wrap updating of cache after pipeline transition in class methodBob Van Landuyt2017-04-071-0/+14
| | * | Rename Ci::PipelineStatus -> Ci::ProjectBuildStatusBob Van Landuyt2017-04-071-0/+173
| | |/
| * | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-076-23/+167
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0614-239/+1027
| | |\
| | * \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-064-9/+64
| | |\ \
| | * \ \ Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0656-146/+686
| | |\ \ \
| | * | | | Added ProtectedTag to import/export son and safe_model_attributesJames Edwards-Jones2017-04-043-0/+36
| | * | | | Renamed ProtectedTag push_access_levels to create_access_levelsJames Edwards-Jones2017-04-043-3/+4
| | * | | | Cleaned up duplication with ProtectedRefAccess concernJames Edwards-Jones2017-04-041-1/+0
| | * | | | Attempt to fix import/export of push_access_levels for protected tagsJames Edwards-Jones2017-04-041-0/+5
| | * | | | Cleanup & tests for UserAccess#can_create_tag?James Edwards-Jones2017-04-041-0/+70
| | * | | | Protected Tags prevents all updates instead of just force pushes.James Edwards-Jones2017-04-041-45/+38
| | * | | | Moved Project#protected_branch? to ProtectedBranch, similar for tagsJames Edwards-Jones2017-04-031-1/+1
| | * | | | Protected Tags enforced over gitJames Edwards-Jones2017-03-311-1/+41
* | | | | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-077-3/+208
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Use Gitlab::Git::Repository#gitaly_... moreJacob Vosmaer2017-04-072-2/+2
| * | | | | Send more Gitaly::Repository fieldsJacob Vosmaer2017-04-071-1/+1
| * | | | | Add /-/readiness /-/liveness and /-/health_metrics endpoints to track applica...Paweł Chojnacki2017-04-074-0/+205
* | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-073-0/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '8998_skip_pending_commits_if_not_head' into 'master' Kamil Trzciński2017-04-072-0/+6
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-073-0/+78
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-0713-247/+963
| | |\ \ \ \ \ \
| | * | | | | | | Also track auto-cancelling in jobs, detail:Lin Jen-Shin2017-04-062-0/+3
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-063-1/+56
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits...Lin Jen-Shin2017-04-0622-53/+198
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | fix fallen import_export specRydkin Maxim2017-04-041-0/+2
| | * | | | | | | | add auto_canceled_by_id to safe_model_attributes.ymlRydkin Maxim2017-04-041-0/+1
| * | | | | | | | | In case of Etag cache hit, the body should be emptyToon Claes2017-04-061-0/+6
| | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'optimise-pipelines' into 'master' Douwe Maan2017-04-061-0/+6
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Merge remote-tracking branch 'origin/master' into optimise-pipelinesoptimise-pipelinesKamil Trzcinski2017-04-0637-301/+1218
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Fix import exportKamil Trzcinski2017-04-061-0/+5
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-0615-247/+1035
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'microsoft-teams-integration' into 'master' Douwe Maan2017-04-063-0/+72
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | adds relevant testsTiago Botelho2017-04-062-0/+71
| | * | | | | | adds initial microsoft teams integrationTiago Botelho2017-04-051-0/+1
| * | | | | | | Merge branch '2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-imple...Kamil Trzciński2017-04-063-0/+131
| |\ \ \ \ \ \ \
| | * | | | | | | Implement a offset calculation on cron_parser_specShinya Maeda2017-04-061-1/+1
| | * | | | | | | Rename cron_time_zone to cron_timezone. Separate add_concurrent_foreign_key.Shinya Maeda2017-04-062-15/+15
| | * | | | | | | Separate cron_valid? and cron_time_zone_valid?Shinya Maeda2017-04-061-13/+25
| | * | | | | | | Dry up next_time_from. Move cron_parser_spec to appropriate location.Shinya Maeda2017-04-062-106/+104
| | * | | | | | | Add Import/Export Setting for trigger_schedule. Remove ref validation.Shinya Maeda2017-04-062-0/+3