[ci skip] Merge branch 'master' into 5845-extract-ee-environments-files
* master: (140 commits) Resolve conflicts in app/views/admin/dashboard/index.html.haml Resolve conflicts in app/controllers/admin/dashboard_controller.rb Resolve conflict in LICENSE fixed copy to cliboard button in embedded snippets Migrates EE-only js components to single file components Use less aggressive sticking for DB load balancing Fix Error 500 viewing admin page due to statement timeouts Fix Error 500 viewing admin page due to statement timeouts Grant privileges after database is created Only setup db in the first checkout! Add a CI job to test ce-upgrade-ee migration path resolve conflicts in locale/gitlab.pot resolve conflicts in app/views/layouts/nav/sidebar/_project.html.haml Project Sidebar: Split CI/CD into CI/CD and Operations Fix GPM content types for Doorkeeper Remove docker pull prefix from registry clipboard feature Port of gitlab-ce!18941 Add contact sales option for Epics Remove unnecessary section-100 css class from application_row.vue Resolve other conflicts in locale/gitlab.pot ...
Showing
- .gitlab-ci.yml 152 additions, 175 deletions.gitlab-ci.yml
- .gitlab/merge_request_templates/Database Changes.md 6 additions, 4 deletions.gitlab/merge_request_templates/Database Changes.md
- CONTRIBUTING.md 13 additions, 21 deletionsCONTRIBUTING.md
- Gemfile 1 addition, 4 deletionsGemfile
- Gemfile.lock 3 additions, 20 deletionsGemfile.lock
- Gemfile.rails5.lock 37 additions, 17 deletionsGemfile.rails5.lock
- LICENSE 0 additions, 5 deletionsLICENSE
- README.md 2 additions, 0 deletionsREADME.md
- app/assets/javascripts/clusters/components/application_row.vue 1 addition, 1 deletion...ssets/javascripts/clusters/components/application_row.vue
- app/assets/javascripts/notes/components/note_edited_text.vue 5 additions, 5 deletionsapp/assets/javascripts/notes/components/note_edited_text.vue
- app/assets/javascripts/notes/components/note_header.vue 15 additions, 15 deletionsapp/assets/javascripts/notes/components/note_header.vue
- app/assets/javascripts/pages/projects/graphs/show/stat_graph_contributors_graph.js 36 additions, 18 deletions...ges/projects/graphs/show/stat_graph_contributors_graph.js
- app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue 77 additions, 0 deletions...pts/pages/projects/wikis/components/delete_wiki_modal.vue
- app/assets/javascripts/pages/projects/wikis/index.js 28 additions, 0 deletionsapp/assets/javascripts/pages/projects/wikis/index.js
- app/assets/javascripts/registry/components/collapsible_container.vue 1 addition, 6 deletions...javascripts/registry/components/collapsible_container.vue
- app/assets/javascripts/registry/components/table_registry.vue 1 addition, 5 deletions...assets/javascripts/registry/components/table_registry.vue
- app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue 3 additions, 3 deletions...idget/components/states/mr_widget_squash_before_merge.vue
- app/assets/javascripts/vue_merge_request_widget/dependencies.js 2 additions, 2 deletions...sets/javascripts/vue_merge_request_widget/dependencies.js
- app/assets/stylesheets/framework/mixins.scss 12 additions, 0 deletionsapp/assets/stylesheets/framework/mixins.scss
- app/assets/stylesheets/framework/snippets.scss 2 additions, 1 deletionapp/assets/stylesheets/framework/snippets.scss
Please register or sign in to comment