delta/gitlab/gitlab-ce.git/lib/api, branch docs-update-docs

Enable the Layout/SpaceBeforeBlockBraces cop

2017-08-09T09:52:22+00:00

Signed-off-by: Rémy Coutable

Re-enable SqlInjection and CommandInjection

2017-08-08T14:50:54+00:00

Merge branch 'rc/fix-commits-api' into 'master'

2017-08-08T12:54:55+00:00

Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name…

Closes #15651

See merge request !13370

Expose noteable_iid in Note

2017-08-08T11:31:55+00:00

Fix the /projects/:id/repository/commits endpoint to handle dots in the ref name when the project full path contains a `/`

2017-08-08T10:54:07+00:00

Signed-off-by: Rémy Coutable

Fix the /projects/:id/repository/tags endpoint to handle dots in the tag name when the project full path contains a `/`

2017-08-08T09:50:58+00:00

Signed-off-by: Rémy Coutable

Merge branch 'master' into ide

2017-08-07T20:20:09+00:00

* master: (177 commits)
  Add changelog
  Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14
  Make contextual sidebar collapsible
  Fixed sidebar context header hover colors
  Use correct `Environment`-class within `Gitlab` namespace
  Remove gl.Activities from Commits page
  Move `let` calls inside the `describe` block using them
  Add `/assign me` alias support for assigning issuables to oneself
  GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError
  Use `broken_storage` in the fs_shards_spec.
  Eager load project creators for project dashboards
  Memoize a user's personal projects count
  Remove redundant query from User#recent_push
  Improve checking if projects would be returned
  Change spelling of gitlab-shell
  Remove unused #tree-holder
  Add custom linter for inline JavaScript to haml_lint
  Rename user_can_admin? because it's more accurate
  Synchronous zanata community contribution translation
  Add Korean translation to i18n
  ...

Merge branch 'bvl-nfs-circuitbreaker' into 'master'

2017-08-07T14:56:15+00:00

Circuitbreaker for storage paths

Closes #32207, #33117, gitlab-com/infrastructure#1946, and gitlab-com/infrastructure#1775

See merge request !11449

Merge branch '32300__expose_more_attributes' into 'master'

2017-08-07T09:52:37+00:00

Expose more attributes to unauthenticated GET /projects/:id

See merge request !13283

Fix batch commit API

2017-08-04T17:25:35+00:00