delta/gitlab/gitlab-ce.git/spec/controllers, branch docs/database-development

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 'bvl-rollback-renamed-system-namespace' into 'master'

2017-08-14T07:39:52+00:00

Don't rename system when migrating from 9.x -> 9.4

Closes #35525 and #36148

See merge request !13228

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

Add option to disable project export on instance

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

Make sure uploads for personal snippets are correctly rendered

2017-08-11T16:15:02+00:00

Merge branch '35435-pending-delete-project-error-in-admin-interface-fix' into 'master'

2017-08-11T15:14:39+00:00

Pending delete projects no longer return 500 error in Admins projects view

Closes #35435

See merge request !13389

Merge branch 'split-events-into-push-events' into 'master'

2017-08-11T14:40:03+00:00

Use a separate table for storing push events

See merge request !12463

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

2017-08-11T12:30:14+00:00

* upstream/master:
  Fix merge request diff deserialisation when too_large was absent
  Bumps omniauth-ldap gem version to 2.0.4
  Remove an unnecessary `let` in spec/features/projects/user_edits_files_spec.rb
  Remove documentation about rules that are now enforced by RuboCop
  Enable the RSpec/HookArgument cop and auto-correct offenses

Just use the repo. Not sure why master could pass

2017-08-11T12:10:43+00:00

It keeps giving me no repo error from setting up autocrlf,
which shouldn't have anything to do with this merge request.

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

2017-08-11T11:15:35+00:00

* upstream/master: (62 commits)
  Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb.
  Docs: update user docs index
  Fix minor typos in views
  Fix Layout/SpaceBeforeBlockBraces violation in bin/changelog_spec
  Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4'
  Merge branch 'import-symlinks-9-3' into 'security-9-3'
  Fix wrong method call on prometheus histogram
  Document new all-in-one Helm chart - docs
  Fix 404 on link path
  Fix line numbers not matching up to code in code viewer.
  Hide overflow-x on collapsed sidebar
  removed global use of breakpoint checker
  Increase performance of the breakpoint size checker
  Filter sensitive query string parameters from NGINX access logs
  Added a template for database changes
  Render new issue link in failed job as a regular link instead of a UJS one
  Include RE2 in the upgrade docs
  Remove affix plugin from issuable sidebar with new navigation
  Fix linter error
  alternative route for download archive
  ...