summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
* Allows MR authors to have the source branch removed when merging the MRJeroen Jacobs2016-05-201-1/+2
|
* Merge branch 'feature/runner-config-untagged-jobs' into 'master' Robert Speicher2016-05-191-1/+1
|\ | | | | | | | | | | | | Add config for CI Runner that prevents it from picking untagged jobs Closes #3456 See merge request !4039
| * Improve displaying validation messages for runnerGrzegorz Bizon2016-05-191-1/+0
| |
| * Add custom validator to runner modelGrzegorz Bizon2016-05-191-1/+2
| |
* | Merge branch 'with-pipeline-view' into 'master' Douwe Maan2016-05-191-0/+59
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | Add pipeline view This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3653 cc @DouweM @grzesiek Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17551 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15625 See merge request !3703
| * Create pipeline objects with parameterswith-pipeline-viewKamil Trzcinski2016-05-181-2/+2
| |
| * Use pipelines.errors when communicating the errorKamil Trzcinski2016-05-181-8/+6
| |
| * Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-164-13/+15
| |\
| * | Improve the pipelines designKamil Trzcinski2016-05-161-1/+1
| | |
| * | Remove testing delegateKamil Trzcinski2016-05-141-2/+2
| | |
| * | Fix specsKamil Trzcinski2016-05-141-3/+0
| | |
| * | Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-133-3/+13
| |\ \
| * | | Fix CI testsKamil Trzcinski2016-05-121-3/+5
| | | |
| * | | Improve pipelines designKamil Trzcinski2016-05-101-48/+17
| | | |
| * | | Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-05-096-23/+50
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/ci/builds/_build.html.haml # app/views/projects/commit/_ci_commit.html.haml # app/views/projects/commit/_commit_box.html.haml
| * \ \ \ Merge remote-tracking branch 'origin/master' into with-pipeline-viewKamil Trzcinski2016-04-269-57/+76
| |\ \ \ \
| * | | | | Improve pipeline viewKamil Trzcinski2016-04-131-0/+5
| | | | | |
| * | | | | Merge branch 'ci-commit-as-pipeline' into with-pipeline-viewKamil Trzcinski2016-04-134-5/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ci-commit-as-pipeline: (131 commits) Optimise Merge Request builds rendering Fix migrations on MySQL Update db/schema.rb Cleanup changes Cleanup required migrations Add indexes concurrently on PostgreSQL Fix CiStatus implementation and tests Fix group_member_spec to not leak information Fix doc for moving an issue Update tests for moving issues via API Tie example config to JIRA screenshot API: Ability to move an issue Added ability to add custom tags to transactions API: Avoid group leak while updating the group API: Return 404 if user does not have access to group Move 'New branch from issue' feature doc to web_editor.md Fix repository cache invalidation issue when project is recreated with an empty repo improve formatting Add `Gitlab.com?` method (doc) fix typo to ssh keys doc url ... Conflicts: app/controllers/projects/pipelines_controller.rb app/helpers/ci_status_helper.rb app/helpers/gitlab_routing_helper.rb app/views/projects/ci/commits/_commit.html.haml app/views/projects/commit/_ci_commit.html.haml
| * | | | | | Pipeline viewKamil Trzcinski2016-04-131-35/+21
| | | | | | |
| * | | | | | Make Pipeline view workKamil Trzcinski2016-04-131-1/+1
| | | | | | |
| * | | | | | WIPKamil Trzcinski2016-04-131-0/+102
| | | | | | |
* | | | | | | Merge branch 'project-variables-ui' into 'master' Jacob Schatz2016-05-191-3/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project variables UI ![Screen_Shot_2016-04-27_at_09.01.23](/uploads/cb9b1ac42aa734cfd3271c03dfaccc12/Screen_Shot_2016-04-27_at_09.01.23.png) ![Screen_Shot_2016-04-27_at_09.01.29](/uploads/4f317014d60f205a0e29497ad20f8a2e/Screen_Shot_2016-04-27_at_09.01.29.png) Closes #14091 See merge request !3942
| * | | | | | | Project variables UIPhil Hughes2016-05-161-3/+27
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Closes #14091
* | | | | | | Merge branch 'docker-registry-view' into 'master' Kamil Trzciński2016-05-181-0/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add container registry support Tasks: - [x] Merge docker/distribution authentication service: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3787 - [x] Implement Docker Registry API - [x] Show a list of docker images in GitLab - [x] Remove registry repository on project deletion - [x] Support project rename, move and namespace rename - [x] Use token when connecting the registry - [x] Allow to delete images from GitLab - [x] Support pushing from GitLab CI (gitlab-ci-token / $CI_BUILD_TOKEN) - [x] Support GitLab Runner pulling for public repositories - [ ] Support GitLab Runner pulling for private repositories - [x] Add tests for Docker Registry API - [x] Add tests for a views - [x] Make texts nicer - [x] Implement a backup support - [ ] Create administration documentation https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4141 - [ ] Create user documentation See merge request !4040
| * | | | | | | Verify if registry is enabled in registryKamil Trzcinski2016-05-181-0/+5
| | | | | | | |
| * | | | | | | Improve code designKamil Trzcinski2016-05-181-2/+4
| | | | | | | |
| * | | | | | | Provide full test coverage to lib/container_registry API implementationKamil Trzcinski2016-05-171-1/+1
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into docker-registry-viewKamil Trzcinski2016-05-164-13/+15
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Change abilities from container_registry to container_imageKamil Trzcinski2016-05-141-2/+2
| | | | | | | |
| * | | | | | | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-133-3/+13
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Fix CI testsKamil Trzcinski2016-05-121-1/+0
| | | | | | | |
| * | | | | | | Rename image to container_registryKamil Trzcinski2016-05-091-3/+3
| | | | | | | |
| * | | | | | | Rename ImageRegistry to ContainerRegistryKamil Trzcinski2016-05-091-6/+3
| | | | | | | |
| * | | | | | | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-095-8/+18
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | WIPKamil Trzcinski2016-05-082-28/+31
| | | | | | | |
| * | | | | | | Implement Container Registry API clientKamil Trzcinski2016-05-041-7/+9
| | | | | | | |
| * | | | | | | Added docker registry viewKamil Trzcinski2016-05-041-0/+26
| | | | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-181-0/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'fix/import-data-issue' into 'master' Rémy Coutable2016-05-181-0/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create import data in service and fix timing issues when scheduling job Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17401 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17376 See merge request !4106
| | * | | | | | | removed transaction stufffix/import-data-issueJames Lopez2016-05-131-3/+1
| | | | | | | | |
| | * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-05-122-3/+5
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/import-data-issue
| | * | | | | | | | more changes based on MR feedbackJames Lopez2016-05-121-1/+1
| | | | | | | | | |
| | * | | | | | | | trying to fix timing issue with import statusJames Lopez2016-05-111-1/+4
| | | |_|/ / / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'Dmitriy Zaporozhets2016-05-184-6/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Change deprecated usage of rendering without response bodyMehmet Emin İNAÇ2016-03-164-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `render nothing: true` has been deprecated. For more information see [pr](https://github.com/rails/rails/pull/20336)
* | | | | | | | | Satisfy RubocopDouwe Maan2016-05-131-1/+1
| | | | | | | | |
* | | | | | | | | Use `@diff_notes_disabled` instead of `@comments_allowed`Douwe Maan2016-05-133-2/+2
| | | | | | | | |
* | | | | | | | | Extract LegacyDiffNote out of NoteDouwe Maan2016-05-134-12/+14
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz2016-05-121-0/+8
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update build log incrementally Proof of concept implementation of incremental sending of build log to browser. cc @jschatz1 @vsizov @grzesiek @tmaczukin See merge request !3737
| * | | | | | | Encode state as base64 stringKamil Trzcinski2016-05-091-8/+1
| | | | | | | |