-
- Downloads
Merge branch 'master' into 'trigger-source'
# Conflicts: # db/schema.rb
No related branches found
No related tags found
Showing
- .gitlab/issue_templates/Bug.md 6 additions, 0 deletions.gitlab/issue_templates/Bug.md
- Gemfile 5 additions, 1 deletionGemfile
- Gemfile.lock 8 additions, 4 deletionsGemfile.lock
- app/assets/javascripts/dispatcher.js 1 addition, 1 deletionapp/assets/javascripts/dispatcher.js
- app/assets/javascripts/dropzone_input.js 1 addition, 0 deletionsapp/assets/javascripts/dropzone_input.js
- app/assets/javascripts/issue_show/components/app.vue 169 additions, 20 deletionsapp/assets/javascripts/issue_show/components/app.vue
- app/assets/javascripts/issue_show/components/description.vue 5 additions, 2 deletionsapp/assets/javascripts/issue_show/components/description.vue
- app/assets/javascripts/issue_show/components/edit_actions.vue 79 additions, 0 deletions...assets/javascripts/issue_show/components/edit_actions.vue
- app/assets/javascripts/issue_show/components/fields/confidential_checkbox.vue 23 additions, 0 deletions...ts/issue_show/components/fields/confidential_checkbox.vue
- app/assets/javascripts/issue_show/components/fields/description.vue 54 additions, 0 deletions.../javascripts/issue_show/components/fields/description.vue
- app/assets/javascripts/issue_show/components/fields/description_template.vue 111 additions, 0 deletions...pts/issue_show/components/fields/description_template.vue
- app/assets/javascripts/issue_show/components/fields/project_move.vue 83 additions, 0 deletions...javascripts/issue_show/components/fields/project_move.vue
- app/assets/javascripts/issue_show/components/fields/title.vue 31 additions, 0 deletions...assets/javascripts/issue_show/components/fields/title.vue
- app/assets/javascripts/issue_show/components/form.vue 104 additions, 0 deletionsapp/assets/javascripts/issue_show/components/form.vue
- app/assets/javascripts/issue_show/components/locked_warning.vue 20 additions, 0 deletions...sets/javascripts/issue_show/components/locked_warning.vue
- app/assets/javascripts/issue_show/event_hub.js 3 additions, 0 deletionsapp/assets/javascripts/issue_show/event_hub.js
- app/assets/javascripts/issue_show/index.js 44 additions, 37 deletionsapp/assets/javascripts/issue_show/index.js
- app/assets/javascripts/issue_show/mixins/animate.js 1 addition, 1 deletionapp/assets/javascripts/issue_show/mixins/animate.js
- app/assets/javascripts/issue_show/mixins/update.js 10 additions, 0 deletionsapp/assets/javascripts/issue_show/mixins/update.js
- app/assets/javascripts/issue_show/services/index.js 15 additions, 2 deletionsapp/assets/javascripts/issue_show/services/index.js
Loading
| Loading
| @@ -109,7 +109,7 @@ gem 'seed-fu', '~> 2.3.5' |
# Markdown and HTML processing | ||
gem 'html-pipeline', '~> 1.11.0' | ||
gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie' | ||
gem 'deckar01-task_list', '2.0.0' | ||
gem 'gitlab-markup', '~> 1.5.1' | ||
gem 'redcarpet', '~> 3.4' | ||
gem 'RedCloth', '~> 4.3.2' | ||
Loading
| Loading
| @@ -370,3 +370,7 @@ gem 'sys-filesystem', '~> 1.1.6' |
gem 'gitaly', '~> 0.7.0' | ||
gem 'toml-rb', '~> 0.3.15', require: false | ||
# Feature toggles | ||
gem 'flipper', '~> 0.10.2' | ||
gem 'flipper-active_record', '~> 0.10.2' |
Please register or sign in to comment