-
- 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
- CHANGELOG 22 additions, 0 deletionsCHANGELOG
- Gemfile 2 additions, 2 deletionsGemfile
- Gemfile.lock 4 additions, 4 deletionsGemfile.lock
- app/assets/javascripts/application.js.coffee 2 additions, 1 deletionapp/assets/javascripts/application.js.coffee
- app/assets/javascripts/behaviors/requires_input.js.coffee 15 additions, 1 deletionapp/assets/javascripts/behaviors/requires_input.js.coffee
- app/assets/javascripts/gl_dropdown.js.coffee 3 additions, 1 deletionapp/assets/javascripts/gl_dropdown.js.coffee
- app/assets/javascripts/labels_select.js.coffee 1 addition, 1 deletionapp/assets/javascripts/labels_select.js.coffee
- app/assets/javascripts/lib/datetime_utility.js.coffee 17 additions, 0 deletionsapp/assets/javascripts/lib/datetime_utility.js.coffee
- app/assets/javascripts/lib/notify.js.coffee 5 additions, 0 deletionsapp/assets/javascripts/lib/notify.js.coffee
- app/assets/javascripts/merge_request_tabs.js.coffee 3 additions, 3 deletionsapp/assets/javascripts/merge_request_tabs.js.coffee
- app/assets/javascripts/merge_request_widget.js.coffee 29 additions, 6 deletionsapp/assets/javascripts/merge_request_widget.js.coffee
- app/assets/javascripts/notes.js.coffee 12 additions, 2 deletionsapp/assets/javascripts/notes.js.coffee
- app/assets/javascripts/profile.js.coffee 5 additions, 2 deletionsapp/assets/javascripts/profile.js.coffee
- app/assets/javascripts/project.js.coffee 9 additions, 8 deletionsapp/assets/javascripts/project.js.coffee
- app/assets/javascripts/project_select.js.coffee 32 additions, 0 deletionsapp/assets/javascripts/project_select.js.coffee
- app/assets/javascripts/todos.js.coffee 2 additions, 0 deletionsapp/assets/javascripts/todos.js.coffee
- app/assets/stylesheets/framework/header.scss 5 additions, 0 deletionsapp/assets/stylesheets/framework/header.scss
- app/assets/stylesheets/framework/nav.scss 3 additions, 3 deletionsapp/assets/stylesheets/framework/nav.scss
- app/assets/stylesheets/framework/variables.scss 1 addition, 0 deletionsapp/assets/stylesheets/framework/variables.scss
- app/assets/stylesheets/pages/events.scss 10 additions, 1 deletionapp/assets/stylesheets/pages/events.scss
Loading
Please register or sign in to comment