Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 7 | -23/+359 |
|\ | |||||
| * | Merge branch 'dosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea... | Sean McGivern | 2017-04-07 | 1 | -0/+2 |
| |\ | |||||
| | * | Add ref and active to import/export config | Sean McGivern | 2017-04-07 | 1 | -0/+2 |
| * | | Merge branch 'bvl-fix-project-ci-status-cache' into 'master' | Kamil Trzciński | 2017-04-07 | 1 | -0/+190 |
| |\ \ | |||||
| | * | | Take the ref of a pipeline into account when caching status | Bob Van Landuyt | 2017-04-07 | 1 | -8/+11 |
| | * | | Rename `ProjectBuildStatus` -> `ProjectPipelineStatus` | Bob Van Landuyt | 2017-04-07 | 1 | -1/+1 |
| | * | | Wrap updating of cache after pipeline transition in class method | Bob Van Landuyt | 2017-04-07 | 1 | -0/+14 |
| | * | | Rename Ci::PipelineStatus -> Ci::ProjectBuildStatus | Bob Van Landuyt | 2017-04-07 | 1 | -0/+173 |
| | |/ | |||||
| * | | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' | Douwe Maan | 2017-04-07 | 6 | -23/+167 |
| |\ \ | | |/ | |/| | |||||
| | * | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags' | Kushal Pandya | 2017-04-06 | 14 | -239/+1027 |
| | |\ | |||||
| | * \ | Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tags | James Edwards-Jones | 2017-04-06 | 4 | -9/+64 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags' | Kushal Pandya | 2017-04-06 | 56 | -146/+686 |
| | |\ \ \ | |||||
| | * | | | | Added ProtectedTag to import/export son and safe_model_attributes | James Edwards-Jones | 2017-04-04 | 3 | -0/+36 |
| | * | | | | Renamed ProtectedTag push_access_levels to create_access_levels | James Edwards-Jones | 2017-04-04 | 3 | -3/+4 |
| | * | | | | Cleaned up duplication with ProtectedRefAccess concern | James Edwards-Jones | 2017-04-04 | 1 | -1/+0 |
| | * | | | | Attempt to fix import/export of push_access_levels for protected tags | James Edwards-Jones | 2017-04-04 | 1 | -0/+5 |
| | * | | | | Cleanup & tests for UserAccess#can_create_tag? | James Edwards-Jones | 2017-04-04 | 1 | -0/+70 |
| | * | | | | Protected Tags prevents all updates instead of just force pushes. | James Edwards-Jones | 2017-04-04 | 1 | -45/+38 |
| | * | | | | Moved Project#protected_branch? to ProtectedBranch, similar for tags | James Edwards-Jones | 2017-04-03 | 1 | -1/+1 |
| | * | | | | Protected Tags enforced over git | James Edwards-Jones | 2017-03-31 | 1 | -1/+41 |
* | | | | | | Merge branch 'master' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 7 | -3/+208 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Use Gitlab::Git::Repository#gitaly_... more | Jacob Vosmaer | 2017-04-07 | 2 | -2/+2 |
| * | | | | | Send more Gitaly::Repository fields | Jacob Vosmaer | 2017-04-07 | 1 | -1/+1 |
| * | | | | | Add /-/readiness /-/liveness and /-/health_metrics endpoints to track applica... | Paweł Chojnacki | 2017-04-07 | 4 | -0/+205 |
* | | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 3 | -0/+18 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '8998_skip_pending_commits_if_not_head' into 'master' | Kamil Trzciński | 2017-04-07 | 2 | -0/+6 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits... | Lin Jen-Shin | 2017-04-07 | 3 | -0/+78 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits... | Lin Jen-Shin | 2017-04-07 | 13 | -247/+963 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Also track auto-cancelling in jobs, detail: | Lin Jen-Shin | 2017-04-06 | 2 | -0/+3 |
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits... | Lin Jen-Shin | 2017-04-06 | 3 | -1/+56 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits... | Lin Jen-Shin | 2017-04-06 | 22 | -53/+198 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | |||||
| | * | | | | | | | | fix fallen import_export spec | Rydkin Maxim | 2017-04-04 | 1 | -0/+2 |
| | * | | | | | | | | add auto_canceled_by_id to safe_model_attributes.yml | Rydkin Maxim | 2017-04-04 | 1 | -0/+1 |
| * | | | | | | | | | In case of Etag cache hit, the body should be empty | Toon Claes | 2017-04-06 | 1 | -0/+6 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'optimise-pipelines' into 'master' | Douwe Maan | 2017-04-06 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into optimise-pipelinesoptimise-pipelines | Kamil Trzcinski | 2017-04-06 | 37 | -301/+1218 |
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | |||||
| | * | | | | | | | Fix import export | Kamil Trzcinski | 2017-04-06 | 1 | -0/+5 |
| | | |/ / / / / | | |/| | | | | | |||||
* | | | | | | | | Merge branch 'master' into new-resolvable-discussion | Douwe Maan | 2017-04-06 | 15 | -247/+1035 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'microsoft-teams-integration' into 'master' | Douwe Maan | 2017-04-06 | 3 | -0/+72 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | adds relevant tests | Tiago Botelho | 2017-04-06 | 2 | -0/+71 |
| | * | | | | | | adds initial microsoft teams integration | Tiago Botelho | 2017-04-05 | 1 | -0/+1 |
| * | | | | | | | Merge branch '2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-imple... | Kamil Trzciński | 2017-04-06 | 3 | -0/+131 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Implement a offset calculation on cron_parser_spec | Shinya Maeda | 2017-04-06 | 1 | -1/+1 |
| | * | | | | | | | Rename cron_time_zone to cron_timezone. Separate add_concurrent_foreign_key. | Shinya Maeda | 2017-04-06 | 2 | -15/+15 |
| | * | | | | | | | Separate cron_valid? and cron_time_zone_valid? | Shinya Maeda | 2017-04-06 | 1 | -13/+25 |
| | * | | | | | | | Dry up next_time_from. Move cron_parser_spec to appropriate location. | Shinya Maeda | 2017-04-06 | 2 | -106/+104 |
| | * | | | | | | | Add Import/Export Setting for trigger_schedule. Remove ref validation. | Shinya Maeda | 2017-04-06 | 2 | -0/+3 |
| | * | | | | | | | Improve cron_parser_spec | Shinya Maeda | 2017-04-06 | 1 | -11/+17 |
| | * | | | | | | | Suppress Import/Export function warnings. Add comment for confirmation. | Shinya Maeda | 2017-04-06 | 2 | -0/+12 |
| | * | | | | | | | Brush up 2 | Shinya Maeda | 2017-04-06 | 1 | -11/+14 |