delta/gitlab/gitlab-ce.git/db/migrate, branch new-diff-notes

Allow reply-by-email with diff notes

2016-07-06T22:51:00+00:00

Add DiffNote model

2016-07-06T22:50:59+00:00

Store diff head and start commit shas on MR diffs

2016-07-06T22:49:03+00:00

Merge branch 'fix/import-url-validator' into 'master'

2016-07-06T15:06:01+00:00


Fixing URL validation for import_url on projects

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17536

This MR fixes problems related to bypassing `import_url` validation on projects. This makes sure the URL is properly validated so we don't enter crap and fail while running workers that handle this URL.

It also adds a migration to fix current invalid `import_url`s

See merge request !4753

Rename `enabled_git_access_protocols` to singular.

2016-07-05T21:54:22+00:00

Add setting that allows admins to choose which Git access protocols are enabled

2016-07-05T21:54:22+00:00

Add a migration to remove requesters that are owners of their project

2016-07-05T16:55:35+00:00

Signed-off-by: Rémy Coutable

Add index on both Award Emoji user and name

2016-07-05T06:51:18+00:00

Merge remote-tracking branch 'upstream/master' into save-artifacts_sizes

2016-07-04T11:14:54+00:00

* upstream/master: (175 commits)
  Document Repository#keep_around
  Don't garbage collect commits that have related DB records like comments
  Update CHANGELOG
  Update RedCloth to 4.3.2 for CVE-2012-6684
  Fix typo in Merge Requests API documentation
  Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq
  Enable Style/EmptyLines cop, remove redundant ones
  Update CHANGELOG
  Cache results from jQuery selectors to retrieve namespace name
  Fix import button when import fail due the namespace already been taken
  Fix snippets comments not displayed
  Fix emoji paths in relative root configurations
  Exclude requesters from Project#members, Group#members and User#members
  Upgrade Thin from 1.6.1 to 1.7.0.
  Many squashed commits
  Cache autocomplete results
  Upgrade Sidekiq from 4.1.2 to 4.1.4.
  Upgrade seed-fu from 2.3.5 to 2.3.6
  use has_many relationship with events
  Support creating a todo on issuables via API
  ...

Remove migration guide comment:

2016-07-01T06:19:46+00:00

They're accessible after doing `rails g migration` anyway.
Though I somehow feel this comment could be useful for someone
who's new and just browsing the source.