-
- Downloads
Merge branch 'ci-commit-as-pipeline' into with-pipeline-view
* 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
Showing
- app/helpers/todos_helper.rb 2 additions, 0 deletionsapp/helpers/todos_helper.rb
- app/models/commit.rb 5 additions, 3 deletionsapp/models/commit.rb
- app/models/commit_status.rb 0 additions, 2 deletionsapp/models/commit_status.rb
- app/models/concerns/ci_status.rb 11 additions, 9 deletionsapp/models/concerns/ci_status.rb
- app/models/concerns/notifiable.rb 0 additions, 15 deletionsapp/models/concerns/notifiable.rb
- app/models/group.rb 1 addition, 0 deletionsapp/models/group.rb
- app/models/member.rb 11 additions, 1 deletionapp/models/member.rb
- app/models/members/group_member.rb 0 additions, 1 deletionapp/models/members/group_member.rb
- app/models/members/project_member.rb 0 additions, 1 deletionapp/models/members/project_member.rb
- app/models/merge_request.rb 3 additions, 3 deletionsapp/models/merge_request.rb
- app/models/notification.rb 0 additions, 77 deletionsapp/models/notification.rb
- app/models/notification_setting.rb 28 additions, 0 deletionsapp/models/notification_setting.rb
- app/models/project.rb 9 additions, 2 deletionsapp/models/project.rb
- app/models/repository.rb 5 additions, 3 deletionsapp/models/repository.rb
- app/models/user.rb 13 additions, 5 deletionsapp/models/user.rb
- app/services/notes/delete_service.rb 8 additions, 0 deletionsapp/services/notes/delete_service.rb
- app/services/notification_service.rb 28 additions, 24 deletionsapp/services/notification_service.rb
- app/views/admin/runners/show.html.haml 1 addition, 1 deletionapp/views/admin/runners/show.html.haml
- app/views/layouts/header/_default.html.haml 2 additions, 0 deletionsapp/views/layouts/header/_default.html.haml
- app/views/layouts/project.html.haml 8 additions, 0 deletionsapp/views/layouts/project.html.haml
Loading
Please register or sign in to comment