-
- Downloads
Merge branch 'master' into 'ph-es-notes-module'
# Conflicts: # app/assets/javascripts/main.js
Branches 40063-markdown-editor-improvements
No related tags found
Showing
- .gitlab-ci.yml 22 additions, 1 deletion.gitlab-ci.yml
- .rubocop.yml 14 additions, 1 deletion.rubocop.yml
- CHANGELOG.md 20 additions, 0 deletionsCHANGELOG.md
- Gemfile 1 addition, 1 deletionGemfile
- Gemfile.lock 4 additions, 4 deletionsGemfile.lock
- app/assets/javascripts/behaviors/secret_values.js 42 additions, 0 deletionsapp/assets/javascripts/behaviors/secret_values.js
- app/assets/javascripts/boards/components/board_sidebar.js 1 addition, 1 deletionapp/assets/javascripts/boards/components/board_sidebar.js
- app/assets/javascripts/dispatcher.js 15 additions, 5 deletionsapp/assets/javascripts/dispatcher.js
- app/assets/javascripts/init_issuable_sidebar.js 2 additions, 2 deletionsapp/assets/javascripts/init_issuable_sidebar.js
- app/assets/javascripts/line_highlighter.js 1 addition, 1 deletionapp/assets/javascripts/line_highlighter.js
- app/assets/javascripts/main.js 0 additions, 2 deletionsapp/assets/javascripts/main.js
- app/assets/javascripts/merge_request.js 128 additions, 133 deletionsapp/assets/javascripts/merge_request.js
- app/assets/javascripts/project_variables.js 0 additions, 39 deletionsapp/assets/javascripts/project_variables.js
- app/assets/javascripts/repo/components/repo_preview.vue 1 addition, 1 deletionapp/assets/javascripts/repo/components/repo_preview.vue
- app/assets/javascripts/right_sidebar.js 220 additions, 218 deletionsapp/assets/javascripts/right_sidebar.js
- app/assets/javascripts/shortcuts_issuable.js 2 additions, 2 deletionsapp/assets/javascripts/shortcuts_issuable.js
- app/assets/javascripts/vue_shared/components/toggle_button.vue 23 additions, 13 deletions...ssets/javascripts/vue_shared/components/toggle_button.vue
- app/assets/stylesheets/framework/contextual-sidebar.scss 2 additions, 1 deletionapp/assets/stylesheets/framework/contextual-sidebar.scss
- app/assets/stylesheets/framework/toggle.scss 34 additions, 30 deletionsapp/assets/stylesheets/framework/toggle.scss
- app/controllers/concerns/boards_responses.rb 2 additions, 2 deletionsapp/controllers/concerns/boards_responses.rb
Loading
Please register or sign in to comment