# Conflicts:
#   config/webpack.config.js

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Port of api-drop-subscribed to EE

See merge request !1364

Parallelise the gitlab:elastic:index_database Rake task

See merge request !1361

Update project list API returns with approvals_before_merge attribute.

See merge request !1245

Empty state for deploy boards

Closes #1814

See merge request !1342

Protected branches dropdown headers

Closes #1294

See merge request !1114

Port of 26847-api-pipelines-use-basic to EE

See merge request !1181

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

* master:
  Rename query parameter to `membership`
  Add filter param for authorized projects for current_user for V4
  Rebase - fix commiter email & name

[ci skip] Fix bad resolved conflict on app/assets/javascripts/environments/stores/environments_store.js

Rebase - fix commiter email & name

Closes #818

See merge request !1341

Port of "Add filter param for user's authorized projects in V4 "

See merge request !1347

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Expose pipelines as PipelineBasic `projects/:id/pipelines`

The `projects/:id/pipelines` exposed a lot of extra details
that are superfluous and it was taking extra resources to fetch them.

To get more details about a pipeline, use
`projects/:id/pipelines/:pipeline_id`.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

* master:
  Remove .es6 from file extensions (!1344)
  Remove .es6 from import statements
  Adjust ESLint rule for file names
  Detect invalid roll out status requests
  Merge 'commons-chunk-plugin' into 'commons-chunk-plugin-ee'
  Port of 'commons-chunk-plugin' to EE

Remove es6 file extension from JavaScript files

See merge request !1344

Remove es6 file extension from JavaScript files

See merge request !9241

Detect invalid roll out status requests

See merge request !1358