• Rémy Coutable's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-05-10 · 2bcb19dd
    Rémy Coutable authored
    # Conflicts:
    #	app/assets/javascripts/merge_request_widget.js
    #	app/assets/javascripts/notes.js
    #	app/assets/javascripts/pipelines/components/stage.js
    #	app/assets/javascripts/pipelines/components/stage.vue
    #	app/assets/javascripts/project_new.js
    #	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_deployment.js
    #	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_memory_usage.js
    #	app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
    #	app/assets/javascripts/vue_merge_request_widget/dependencies.js
    #	app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
    #	app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
    #	app/assets/javascripts/vue_shared/components/memory_graph.js
    #	app/assets/stylesheets/framework/lists.scss
    #	app/assets/stylesheets/framework/memory_graph.scss
    #	app/assets/stylesheets/pages/merge_requests.scss
    #	app/controllers/projects/branches_controller.rb
    #	app/controllers/projects/merge_requests_controller.rb
    #	app/helpers/merge_requests_helper.rb
    #	app/models/project.rb
    #	app/models/user.rb
    #	app/presenters/merge_request_presenter.rb
    #	app/serializers/environment_entity.rb
    #	app/serializers/merge_request_basic_entity.rb
    #	app/serializers/merge_request_entity.rb
    #	app/services/ci/create_pipeline_service.rb
    #	app/views/projects/blob/_header.html.haml
    #	app/views/projects/merge_requests/_show.html.haml
    #	app/views/projects/tree/_tree_content.html.haml
    #	app/views/shared/issuable/_sidebar.html.haml
    #	app/views/shared/issuable/form/_merge_params.html.haml
    #	app/views/shared/issuable/form/_metadata.html.haml
    #	config/webpack.config.js
    #	db/schema.rb
    #	doc/intro/README.md
    #	doc/user/project/issues/index.md
    #	doc/user/project/issues/issues_functionalities.md
    #	features/steps/project/forked_merge_requests.rb
    #	features/steps/project/merge_requests.rb
    #	features/support/env.rb
    #	lib/gitlab/checks/change_access.rb
    #	spec/controllers/groups_controller_spec.rb
    #	spec/controllers/projects/merge_requests_controller_spec.rb
    #	spec/controllers/projects_controller_spec.rb
    #	spec/features/merge_requests/closes_issues_spec.rb
    #	spec/features/security/project/private_access_spec.rb
    #	spec/fixtures/api/schemas/entities/merge_request.json
    #	spec/fixtures/api/schemas/entities/merge_request_basic.json
    #	spec/helpers/merge_requests_helper_spec.rb
    #	spec/javascripts/vue_mr_widget/components/mr_widget_deployment_spec.js
    #	spec/presenters/merge_request_presenter_spec.rb
    #	spec/serializers/merge_request_entity_spec.rb
    #	spec/serializers/pipeline_serializer_spec.rb
    [ci skip]
    2bcb19dd
application.rb 6.47 KB