Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '5480-epic-notifications-ce' into 'master' | Douwe Maan | 2018-05-07 | 2 | -3/+8 |
|\ | | | | | | | | | Backport 5480-epic-notifications from EE See merge request gitlab-org/gitlab-ce!18724 | ||||
| * | Backport 5480-epic-notifications from EE | Mario de la Ossa | 2018-05-07 | 2 | -3/+8 |
| | | |||||
* | | Merge branch 'upgrade-to-webpack-v4' into 'master' | Clement Ho | 2018-05-07 | 2 | -2/+29 |
|\ \ | | | | | | | | | | | | | | | | | | | Upgrade to Webpack 4 Closes #43400 See merge request gitlab-org/gitlab-ce!17218 | ||||
| * \ | Merge branch 'master' into upgrade-to-webpack-v4 | Mike Greiling | 2018-05-07 | 21 | -63/+217 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (252 commits) Upgrade underscore.js Enable prometheus metrics by default Add signature verification badge to compare view Add Changelog Update instalation from source guide fix Web IDE file tree scroll issue Enable quick support actions default Backport of 4084-epics-username-autocomplete Remove top margin on the terms page with performance bar Backports every CE related change from ee-44542 to CE Fix typo in changelog entry fix missing space Backport IdentityLinker#failed? from GroupSaml callback flow Add ci_cd_settings delete_all dependency on project AutoDevOps Docs fix invalid external link Ignore knapsack and rspec_flaky Ensure web hook 'blocked URL' errors are stored in as web hook logs and properly surfaced to the user Partially revert ebcd5711c5ff937bf925002bf9a5b636b037684e to fix runner pages Reuses `InternalRedirect` when possible Enforces terms in the web application ... | ||||
| * | | | remove unused methods until needed | Mike Greiling | 2018-05-07 | 1 | -22/+0 |
| | | | | |||||
| * | | | update webpack manifest integration to recognize multi-chunk entrypoints | Mike Greiling | 2018-05-01 | 1 | -0/+49 |
| | | | | |||||
| * | | | move dev server middleware to new namespace | Mike Greiling | 2018-05-01 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch '42099-port-push-mirroring-to-ce-ce-port-v-2' into 'master' | Douwe Maan | 2018-05-07 | 2 | -0/+2 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | CE backport of Backports Push Mirrors to CE Closes #42099 See merge request gitlab-org/gitlab-ce!18715 | ||||
| * | | | Backports every CE related change from ee-5484 to CE | Tiago Botelho | 2018-05-07 | 2 | -0/+2 |
| | |/ | |/| | |||||
* | | | Client implementation GetRawChanges | Zeger-Jan van de Weg | 2018-05-07 | 3 | -9/+34 |
| | | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitaly/issues/1138 | ||||
* | | | Merge branch 'live-trace-v2-efficient-destroy-all' into 'master' | Grzegorz Bizon | 2018-05-07 | 2 | -3/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | 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-all | Shinya Maeda | 2018-05-07 | 11 | -13/+122 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-all | Shinya Maeda | 2018-05-04 | 2 | -3/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-all | Shinya Maeda | 2018-05-03 | 10 | -47/+91 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-all | Shinya Maeda | 2018-05-02 | 13 | -61/+172 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Introduces `FastDestroyAll` module | Shinya Maeda | 2018-05-01 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-all | Shinya Maeda | 2018-05-01 | 5 | -19/+115 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-all | Shinya Maeda | 2018-04-30 | 6 | -14/+130 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix specs. Align with the new table name ci_build_trace_chunk | Shinya Maeda | 2018-04-26 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'live-trace-v2' into live-trace-v2-efficient-destroy-all | Shinya Maeda | 2018-04-26 | 13 | -184/+50 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into live-trace-v2-efficient-destroy-all | Shinya Maeda | 2018-04-25 | 12 | -7/+124 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Implement efficient destroy of job_trace_chunks | Kamil Trzciński | 2018-04-24 | 2 | -4/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Swap redis chunks when build finished | Shinya Maeda | 2018-04-24 | 2 | -5/+5 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Enforce proper 416 support for runner trace patch endpoint | Kamil Trzciński | 2018-05-07 | 2 | -4/+15 |
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'master' into live-trace-v2 | Shinya Maeda | 2018-05-07 | 11 | -13/+122 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch ↵ | Kamil Trzciński | 2018-05-06 | 2 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui' into 'master' Resolve "Specify variables when executing a manual pipeline from the UI" Closes #44059 See merge request gitlab-org/gitlab-ce!18440 | ||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into ↵ | Matija Čupić | 2018-05-02 | 1 | -40/+4 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into ↵ | Matija Čupić | 2018-05-02 | 19 | -66/+254 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui | ||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into ↵ | Jose | 2018-04-30 | 72 | -181/+695 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui | ||||
| | * | | | | | | | | | | | | Extend Gitlab::Ci::Pipeline::Chain::Command with variables_attributes | Matija Čupić | 2018-04-18 | 2 | -2/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Backports every CE related change from ee-44542 to CE | Tiago Botelho | 2018-05-04 | 5 | -2/+84 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Backport IdentityLinker#failed? from GroupSaml callback flow | James Edwards-Jones | 2018-05-04 | 1 | -0/+4 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Update repository.rb | Kim Carlbäcker | 2018-05-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Add note about rebase/squash duplication in Gitaly | Kim Carlbäcker | 2018-05-04 | 1 | -1/+8 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Resolve "Reconcile project templates with Auto DevOps" | Fabio Busatto | 2018-05-04 | 1 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'feature/runner-per-group' into 'master' | Kamil Trzciński | 2018-05-04 | 2 | -6/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shared CI runners for groups See merge request gitlab-org/gitlab-ce!9646 | ||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into feature/runner-per-group | Dylan Griffith | 2018-05-03 | 30 | -140/+505 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | Remove API changes for assigning group runner to project | Dylan Griffith | 2018-04-30 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we are going to handle the API stuff later we can just leave this as error case since the model validations will stop this | ||||
| | * | | | | | | | | | | | | | | Start persisting runner_type when creating runners | Dylan Griffith | 2018-04-30 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Rename Runner#group? -> #assigned_to_group? and Runner#project? -> ↵ | Dylan Griffith | 2018-04-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #assigned_to_project? | ||||
| | * | | | | | | | | | | | | | | Fix up db/schema.rb changes leftover and comments out of date | Dylan Griffith | 2018-04-30 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Exclude group_runners_enabled in project import/export | Dylan Griffith | 2018-04-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge branch 'master' into siemens-runner-per-group | Dylan Griffith | 2018-04-26 | 21 | -170/+154 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into siemens-runner-per-group | Dylan Griffith | 2018-04-24 | 8 | -7/+162 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | runner can't be assigned to more than 1 group | Alexis Reigel | 2018-04-23 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | therefore we don't need the api check. | ||||
| | * | | | | | | | | | | | | | | | | disallow group runners to become project runners | Alexis Reigel | 2018-04-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | revert support for v3 api | Alexis Reigel | 2018-04-23 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | support group runners in existing API endpoints | Alexis Reigel | 2018-04-23 | 4 | -4/+21 |
| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'master' into live-trace-v2 | Shinya Maeda | 2018-05-04 | 2 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Fix lambda arguments in Grape entities | Rémy Coutable | 2018-05-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> |