-
- 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
No related branches found
No related tags found
Showing
- app/assets/stylesheets/pages/issuable.scss 6 additions, 0 deletionsapp/assets/stylesheets/pages/issuable.scss
- app/assets/stylesheets/pages/merge_requests.scss 1 addition, 0 deletionsapp/assets/stylesheets/pages/merge_requests.scss
- app/assets/stylesheets/pages/note_form.scss 13 additions, 1 deletionapp/assets/stylesheets/pages/note_form.scss
- app/assets/stylesheets/pages/notes.scss 22 additions, 4 deletionsapp/assets/stylesheets/pages/notes.scss
- app/assets/stylesheets/pages/todos.scss 5 additions, 0 deletionsapp/assets/stylesheets/pages/todos.scss
- app/controllers/groups/notification_settings_controller.rb 16 additions, 0 deletionsapp/controllers/groups/notification_settings_controller.rb
- app/controllers/omniauth_callbacks_controller.rb 16 additions, 10 deletionsapp/controllers/omniauth_callbacks_controller.rb
- app/controllers/profiles/notifications_controller.rb 8 additions, 29 deletionsapp/controllers/profiles/notifications_controller.rb
- app/controllers/projects/merge_requests_controller.rb 2 additions, 2 deletionsapp/controllers/projects/merge_requests_controller.rb
- app/controllers/projects/notes_controller.rb 1 addition, 2 deletionsapp/controllers/projects/notes_controller.rb
- app/controllers/projects/notification_settings_controller.rb 16 additions, 0 deletionsapp/controllers/projects/notification_settings_controller.rb
- app/controllers/projects/repositories_controller.rb 0 additions, 1 deletionapp/controllers/projects/repositories_controller.rb
- app/controllers/projects_controller.rb 8 additions, 4 deletionsapp/controllers/projects_controller.rb
- app/helpers/application_helper.rb 1 addition, 1 deletionapp/helpers/application_helper.rb
- app/helpers/ci_status_helper.rb 9 additions, 3 deletionsapp/helpers/ci_status_helper.rb
- app/helpers/gitlab_routing_helper.rb 0 additions, 8 deletionsapp/helpers/gitlab_routing_helper.rb
- app/helpers/issues_helper.rb 1 addition, 0 deletionsapp/helpers/issues_helper.rb
- app/helpers/namespaces_helper.rb 10 additions, 2 deletionsapp/helpers/namespaces_helper.rb
- app/helpers/notifications_helper.rb 34 additions, 34 deletionsapp/helpers/notifications_helper.rb
- app/helpers/projects_helper.rb 5 additions, 12 deletionsapp/helpers/projects_helper.rb
Loading
Please register or sign in to comment