• Rémy Coutable's avatar
    Merge remote-tracking branch 'upstream/master' into ce-to-ee-2017-05-17 · e5c2aef5
    Rémy Coutable authored
    # Conflicts:
    #	.gitlab-ci.yml
    #	CHANGELOG.md
    #	app/assets/javascripts/dispatcher.js
    #	app/assets/javascripts/environments/components/environments_table.vue
    #	app/assets/javascripts/gl_dropdown.js
    #	app/assets/javascripts/issuable_form.js
    #	app/assets/javascripts/milestone_select.js
    #	app/assets/javascripts/users_select.js
    #	app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
    #	app/assets/javascripts/vue_merge_request_widget/dependencies.js
    #	app/assets/javascripts/vue_shared/components/ci_badge_link.vue
    #	app/assets/stylesheets/pages/issuable.scss
    #	app/assets/stylesheets/pages/merge_requests.scss
    #	app/controllers/projects/issues_controller.rb
    #	app/helpers/diff_helper.rb
    #	app/helpers/submodule_helper.rb
    #	app/models/blob.rb
    #	app/models/group.rb
    #	app/models/issue_assignee.rb
    #	app/models/project.rb
    #	app/models/user.rb
    #	app/services/issuable_base_service.rb
    #	app/views/admin/health_check/show.html.haml
    #	app/views/projects/branches/new.html.haml
    #	app/views/projects/edit.html.haml
    #	app/views/projects/issues/index.html.haml
    #	app/views/projects/issues/show.html.haml
    #	app/workers/post_receive.rb
    #	config/webpack.config.js
    #	db/schema.rb
    #	doc/api/issues.md
    #	doc/development/architecture.md
    #	doc/topics/authentication/index.md
    #	doc/user/admin_area/settings/usage_statistics.md
    #	features/project/project.feature
    #	features/steps/project/project.rb
    #	lib/api/entities.rb
    #	lib/api/services.rb
    #	lib/api/users.rb
    #	lib/gitlab/database/migration_helpers.rb
    #	lib/gitlab/gitaly_client/commit.rb
    #	spec/controllers/groups_controller_spec.rb
    #	spec/features/auto_deploy_spec.rb
    #	spec/features/dashboard/group_spec.rb
    #	spec/features/issues/form_spec.rb
    #	spec/javascripts/gl_dropdown_spec.js
    #	spec/javascripts/issue_show/issue_title_description_spec.js
    #	spec/lib/gitlab/file_finder_spec.rb
    #	spec/lib/gitlab/project_search_results_spec.rb
    #	spec/lib/gitlab/workhorse_spec.rb
    #	spec/models/application_setting_spec.rb
    #	spec/models/group_spec.rb
    #	spec/models/project_spec.rb
    #	spec/models/user_spec.rb
    #	spec/policies/project_snippet_policy_spec.rb
    #	spec/requests/api/issues_spec.rb
    #	spec/support/kubernetes_helpers.rb
    #	spec/workers/post_receive_spec.rb
    [ci skip]
    e5c2aef5
.gitignore 1016 Bytes