delta/gitlab/gitlab-ce.git/app/models/note.rb, branch performance-bar-sql

Merge branch 'security-10-1' into '10-1-stable'

2017-10-17T22:58:58+00:00

Security fixes for 10.1 RC

See merge request gitlab/gitlabhq!2209

Commenting on image diffs

2017-10-07T04:25:17+00:00

add controller spec

2017-09-06T13:00:57+00:00

also fix some code styling issues

rework the contributor badge

2017-09-06T13:00:57+00:00

 - only show in merge-requests
 - show as a little glyph

round of fixes after code review

2017-09-06T13:00:57+00:00

WIP: refactor the first-contributor to Issuable

2017-09-06T13:00:57+00:00

this will remove the need make N queries (per-note) at the
cost of having to mark notes with an attribute

this opens up the possibility for other special roles for notes

Fix specs

2017-08-30T08:43:10+00:00

Prefer polymorphism over `is_a?`

2017-08-17T17:26:45+00:00

Merge branch 'master' into issue-discussions-refactor

2017-08-10T10:12:22+00:00

* master: (42 commits)
  alternative route for download archive
  Add missing command to compile GetText files
  Prevent user from changing username with container registry tags
  Rename RPC 'Exists' to 'RepositoryExists'
  Fix the sticky changes bar on commits page
  Fix ee_compat_check when EE branch uses a prefix
  Removed display styles when hiding the fly out navigation
  Explain why we use select all for project_url_constrainer.rb
  Fix pikaday being undefined
  Add a helper to stub storage settings with defaults
  Enable the Layout/SpaceBeforeBlockBraces cop
  update Install from Source instructions
  Translations can be picked without asking for exceptions
  Ask for exceptions in advance
  Don't require stackprof in Gemfile
  Synchronous Korean translation in zanata
  Use full path of user's avatar in webhooks
  Update icon color on hover
  Align all nav items in sidebar
  Fix height of collapsed sidebar items
  ...

Enable the Layout/SpaceBeforeBlockBraces cop

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

Signed-off-by: Rémy Coutable