gitlab-org--gitlab-foss/spec
Douwe Maan 02591b0430 Merge branch 'disable-commenting-on-unrelatable-diff-line' into 'master'
Disable commenting on unrelatable diff line

## What does this MR do?

Fixes a bug where users can comment on diff lines that can't be commented on and attached to.

This is the case for unfolded lines and lines that appear as snippets in the discussion tab.

**!5864 should be merged before this MR.**

## Are there points in the code the reviewer needs to double check?

😕 

## Why was this MR needed?

Comments were getting lost on the discussion feed, unable to find their related diff.

## What are the relevant issue numbers?

Closes #20633.

## Screenshots (if relevant)

![diffs-comment-fix](/uploads/f902b687fda75492e38397f9705283e0/diffs-comment-fix.mp4)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5681
2016-08-23 21:28:07 +00:00
..
config Small refactor and a few documentation fixes 2016-08-04 19:02:39 +02:00
controllers Fix incorrect "stopped impersonation" log message 2016-08-23 01:09:16 -07:00
factories Add endpoints for pipelines 2016-08-18 16:56:39 +02:00
features Merge branch 'disable-commenting-on-unrelatable-diff-line' into 'master' 2016-08-23 21:28:07 +00:00
finders Merge branch 'issue_18135' into 'master' 2016-08-19 23:06:30 +00:00
fixtures Fix JSON schema to issues in issue board lists 2016-08-19 11:47:33 -03:00
helpers Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showing-pipeline 2016-08-20 00:09:58 +08:00
initializers Give priority to environment variables 2016-08-03 15:48:48 +01:00
javascripts Merge branch 'lbennett/gitlab-ce-17465-search-for-project-with-cursor-keys' into 'master' 2016-08-19 19:36:47 +00:00
lib Merge branch 'metrics-typo' into 'master' 2016-08-22 13:15:15 +00:00
mailers Merge branch 'master' into 'expiration-date-on-memberships' 2016-08-19 10:58:01 +00:00
models Fix Error 500 resulting when loading network graph 2016-08-20 09:57:20 -07:00
requests Merge branch 'master' into expiration-date-on-memberships 2016-08-18 19:04:31 -05:00
routing Support integration with Koding (online IDE) 2016-08-19 12:10:58 -07:00
services Merge branch 'mark-as-processable' into 'master' 2016-08-19 18:35:07 +00:00
support Merge branch '4273-slash-commands' into 'master' 2016-08-18 16:41:16 -05:00
tasks/gitlab Use `File::exist?` instead of `File::exists?` 2016-08-11 13:54:45 +03:00
uploaders Remove VideoJS and clean the integration 2016-07-20 11:36:42 +02:00
views Update Hamlit to 2.6.1 2016-08-18 13:26:32 -05:00
workers Merge branch '21010-emailsonpushworker-incorrectly-claims-deleted-a-commit-after-a-push' into 'master' 2016-08-19 18:16:55 +00:00
factories_spec.rb adds second batch of tests changed to active tense 2016-08-09 15:11:39 +01:00
rails_helper.rb
simplecov_env.rb Bump SimpleCov merge timeout to 365 days 2016-08-22 13:44:14 +02:00
spec_helper.rb Use travel_to instead of dependency injection, feedback: 2016-08-19 16:57:25 +08:00
teaspoon_env.rb Add test coverage analysis for CoffeeScript (!5052) 2016-08-07 21:52:37 +02:00