delta/gitlab/gitlab-ce.git/spec/requests, branch issue_31790

Fix API responses when dealing with txt files

2017-08-15T14:32:48+00:00

Merge branch 'forks-count-cache' into 'master'

2017-08-15T08:13:01+00:00

Cache the number of forks of a project

See merge request !13535

Cache the number of forks of a project

2017-08-14T16:00:28+00:00

The number of forks of a project doesn't change very frequently and
running a COUNT(*) every time this information is requested can be quite
expensive. We also end up running such a COUNT(*) query at least twice
on the homepage of a project.

By caching this data and refreshing it when necessary we can reduce
project homepage loading times by around 60 milliseconds (based on the
timings of https://gitlab.com/gitlab-org/gitlab-ce).

Use with_repo_branch_commit instead of fetch_ref directly

2017-08-14T14:55:34+00:00

So that we could limit the access to Repository#fetch_ref
See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13416#note_37487433

Add comments about why we're stubbing them

2017-08-14T12:06:55+00:00

Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-better

2017-08-14T11:33:35+00:00

* upstream/master: (47 commits)
  Update CHANGELOG.md for 9.4.5
  Update charlock_holmes
  add a changelog entry
  switch to multi-line before block
  restructure the #new_key notification spec
  don't send devise notifications to the ghost user
  reset_delivered_emails before testing #new_key
  skip the :read_project check for new_project_member
  move the member spec to be with the other ones
  add a spec for new_group_member
  add a spec for never emailing the ghost user
  rubocop fix
  a membership with no user is always notifiable
  check notifiability for more emails
  add Member#notifiable?(type, opts)
  make NotificationRecipient a little more customizable
  Add notes about database performance for MySQL
  fix confidential border issue as well as confidential styles leaking on new MR
  Migrate force push check to Gitaly
  Add option to disable project export on instance
  ...

Merge branch 'disable-project-export' into 'master'

2017-08-11T17:33:45+00:00

Add option to disable project export on instance

See merge request !13211

Merge branch '32004-use-timecop-safe-mode' into 'master'

2017-08-11T16:59:37+00:00

Enable Timecop safe mode

Closes #32004

See merge request !13498

Add option to disable project export on instance

2017-08-11T16:22:37+00:00

Merge branch '36213-return-is_admin-in-users-api-when-current_user-is-admin' into 'master'

2017-08-11T15:46:17+00:00

Include the `is_admin` field in the `GET /users/:id` API when current user is an admin

Closes #36213

See merge request !13501