Douwe Maan 579951720a Merge branch 'diff-line-comment-vuejs' into 'master' ... Diff line comments resolve ## What does this MR do? Diff line comments can be resolved. Part of #10325 To do: - [x] Backend (@DouweM) - [x] Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13319326. Will be made easier by https://gitlab.com/gitlab-org/gitlab-ce/issues/17237#note_13370331 - [x] System note when all discussions are resolved - [x] Notification when all discussions are resolved - [x] Write unit tests - [x] Look at resolve time https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022#note_13912743 - Fixed by 4a13aa9 - [x] Frontend (@iamphill) - [x] Fix bugs - [x] Write more feature tests - [x] Frontend (@connorshea) - [x] Address frontend feedback - [x] Feature specs for Jump feature - [x] Documentation - [x] Add Vue.js in a standard way See merge request !5022		2016-08-19 02:24:34 +00:00
..
environments	Remove quiet_assets in favor of built-in sprockets-rails config.	2016-06-30 16:18:05 -06:00
initializers	Small refactor and syntax fixes.	2016-08-18 16:47:26 -05:00
locales	Minor fixes after a final look at the diff.	2016-05-11 10:30:47 +05:30
application.rb	Merge branch 'master' into diff-line-comment-vuejs	2016-08-17 12:10:09 -06:00
aws.yml.example	Add a note that changing example configuration files requires changing omnibus-gitlab.	2015-06-11 15:11:37 +02:00
boot.rb	Enable the Rubocop DeprecatedClassMethods cop	2016-05-08 15:33:34 -06:00
database.yml.env	Improving the "Environment variables" administration doc	2016-02-01 19:10:46 +01:00
database.yml.mysql
database.yml.postgresql
dependency_decisions.yml	Whitelist 'Simplified BSD' license	2016-07-26 15:25:15 -06:00
environment.rb	Rails update to 4.2.4	2015-11-25 18:18:44 +02:00
gitlab.yml.example	Update default path for repository_downloads_path in gitlab.yml.example	2016-07-21 10:31:49 -03:00
license_finder.yml	Resolve feedback.	2016-06-06 13:39:36 -06:00
mail_room.yml	Synced mail_room.yml with the one in omnibus	2016-08-04 18:55:37 +02:00
newrelic.yml	Revert "Remove newrelic gem. Closes #12860"	2016-02-23 07:25:37 -08:00
resque.yml.example	Added Redis Sentinel support documentation	2016-08-04 18:55:37 +02:00
routes.rb	Merge branch 'master' into diff-line-comment-vuejs	2016-08-18 16:43:26 -05:00
secrets.yml.example	Groundwork for merging CI into CE	2015-08-25 18:42:46 -07:00
sidekiq.yml.example	bug found by Charles Sibbald at Sky . Calls with patricio and Jacob confirmed this	2016-02-18 18:58:51 +00:00
unicorn.rb.example	Fix typos and grammar	2016-02-10 12:43:19 +02:00
unicorn.rb.example.development