-
- Downloads
Merge branch 'master' into 'trigger-source'
# Conflicts: # db/schema.rb
Showing
- app/assets/javascripts/issue_show/stores/index.js 21 additions, 1 deletionapp/assets/javascripts/issue_show/stores/index.js
- app/assets/javascripts/lib/utils/text_utility.js 1 addition, 1 deletionapp/assets/javascripts/lib/utils/text_utility.js
- app/assets/javascripts/shortcuts_issuable.js 3 additions, 1 deletionapp/assets/javascripts/shortcuts_issuable.js
- app/assets/javascripts/task_list.js 1 addition, 1 deletionapp/assets/javascripts/task_list.js
- app/assets/javascripts/vue_shared/components/markdown/field.vue 107 additions, 0 deletions...sets/javascripts/vue_shared/components/markdown/field.vue
- app/assets/javascripts/vue_shared/components/markdown/header.vue 113 additions, 0 deletions...ets/javascripts/vue_shared/components/markdown/header.vue
- app/assets/javascripts/vue_shared/components/markdown/toolbar.vue 33 additions, 0 deletions...ts/javascripts/vue_shared/components/markdown/toolbar.vue
- app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue 58 additions, 0 deletions...scripts/vue_shared/components/markdown/toolbar_button.vue
- app/assets/javascripts/vue_shared/mixins/tooltip.js 4 additions, 0 deletionsapp/assets/javascripts/vue_shared/mixins/tooltip.js
- app/assets/stylesheets/framework/filters.scss 1 addition, 0 deletionsapp/assets/stylesheets/framework/filters.scss
- app/assets/stylesheets/framework/variables.scss 1 addition, 1 deletionapp/assets/stylesheets/framework/variables.scss
- app/assets/stylesheets/pages/notes.scss 3 additions, 3 deletionsapp/assets/stylesheets/pages/notes.scss
- app/controllers/admin/jobs_controller.rb 2 additions, 2 deletionsapp/controllers/admin/jobs_controller.rb
- app/controllers/concerns/issuable_actions.rb 10 additions, 1 deletionapp/controllers/concerns/issuable_actions.rb
- app/controllers/dashboard_controller.rb 1 addition, 1 deletionapp/controllers/dashboard_controller.rb
- app/controllers/projects/artifacts_controller.rb 2 additions, 2 deletionsapp/controllers/projects/artifacts_controller.rb
- app/controllers/projects/build_artifacts_controller.rb 55 additions, 0 deletionsapp/controllers/projects/build_artifacts_controller.rb
- app/controllers/projects/builds_controller.rb 6 additions, 116 deletionsapp/controllers/projects/builds_controller.rb
- app/controllers/projects/issues_controller.rb 1 addition, 4 deletionsapp/controllers/projects/issues_controller.rb
- app/controllers/projects/jobs_controller.rb 131 additions, 0 deletionsapp/controllers/projects/jobs_controller.rb
Loading
Please register or sign in to comment