Find a file
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
.github
app Merge branch 'disable-commenting-on-unrelatable-diff-line' into 'master' 2016-08-23 21:28:07 +00:00
bin
builds
config Revert the revert of Optimistic Locking 2016-08-22 18:43:13 +03:00
db Change merge_error column from string to text type 2016-08-23 08:32:38 -07:00
doc Fix typo in gitlab_flow.md 2016-08-23 17:02:58 +02:00
docker
features Fix Spinach branches spec 2016-08-23 18:04:43 +01:00
fixtures/emojis
generator_templates/active_record/migration
lib entities: make Environment inherit EnvironmentBasic 2016-08-23 10:25:17 -04:00
log
public
rubocop
scripts
shared
spec Merge branch 'disable-commenting-on-unrelatable-diff-line' into 'master' 2016-08-23 21:28:07 +00:00
tmp
vendor drop execute bit 2016-08-19 08:11:07 +03:00
.csscomb.json
.flayignore
.foreman
.gitattributes
.gitignore
.gitlab-ci.yml
.mailmap
.pkgr.yml
.rspec
.rubocop.yml
.rubocop_todo.yml
.ruby-version
.scss-lint.yml
.vagrant_enabled
CHANGELOG Merge branch 'disable-commenting-on-unrelatable-diff-line' into 'master' 2016-08-23 21:28:07 +00:00
config.ru
CONTRIBUTING.md Update contribution acceptance criteria with tests requirements 2016-08-19 09:24:51 +00:00
doc_styleguide.md
docker-compose.yml
Gemfile Merge branch 'rs-update-doorkeeper' into 'master' 2016-08-18 23:23:21 +00:00
Gemfile.lock Merge branch 'rs-update-doorkeeper' into 'master' 2016-08-18 23:23:21 +00:00
GITLAB_SHELL_VERSION Update gitlab-shell to v3.4.0 2016-08-20 10:57:10 +02:00
GITLAB_WORKHORSE_VERSION Fix typo in gitlab-workhorse header 2016-08-19 12:25:52 +02:00
LICENSE
MAINTENANCE.md
PROCESS.md
Procfile
Rakefile
README.md
VERSION 8.11 is released, long live 8.12 2016-08-23 10:00:38 +02:00

GitLab

build status Code Climate

Canonical source

The source of GitLab Community Edition is hosted on GitLab.com and there are mirrors to make contributing as easy as possible.

Open source software to collaborate on code

To see how GitLab looks please see the features page on our website.

  • Manage Git repositories with fine grained access controls that keep your code secure
  • Perform code reviews and enhance collaboration with merge requests
  • Each project can also have an issue tracker and a wiki
  • Used by more than 100,000 organizations, GitLab is the most popular solution to manage Git repositories on-premises
  • Completely free and open source (MIT Expat license)
  • Powered by Ruby on Rails

Hiring

We're hiring developers, support people, and production engineers all the time, please see our jobs page.

Editions

There are two editions of GitLab:

  • GitLab Community Edition (CE) is available freely under the MIT Expat license.
  • GitLab Enterprise Edition (EE) includes extra features that are more useful for organizations with more than 100 users. To use EE and get official support please become a subscriber.

Website

On about.gitlab.com you can find more information about:

Requirements

Please see the requirements documentation for system requirements and more information about the supported operating systems.

Installation

The recommended way to install GitLab is with the Omnibus packages on our package server. Compared to an installation from source, this is faster and less error prone. Just select your operating system, download the respective package (Debian or RPM) and install it using the system's package manager.

There are various other options to install GitLab, please refer to the installation page on the GitLab website for more information.

You can access a new installation with the login root and password 5iveL!fe, after login you are required to set a unique password.

Install a development environment

To work on GitLab itself, we recommend setting up your development environment with the GitLab Development Kit. If you do not use the GitLab Development Kit you need to install and setup all the dependencies yourself, this is a lot of work and error prone. One small thing you also have to do when installing it yourself is to copy the example development unicorn configuration file:

cp config/unicorn.rb.example.development config/unicorn.rb

Instructions on how to start GitLab and how to run the tests can be found in the development section of the GitLab Development Kit.

Software stack

GitLab is a Ruby on Rails application that runs on the following software:

  • Ubuntu/Debian/CentOS/RHEL
  • Ruby (MRI) 2.1
  • Git 2.7.4+
  • Redis 2.8+
  • MySQL or PostgreSQL

For more information please see the architecture documentation.

Third-party applications

There are a lot of third-party applications integrating with GitLab. These include GUI Git clients, mobile applications and API wrappers for various languages.

GitLab release cycle

For more information about the release process see the release documentation.

Upgrading

For upgrading information please see our update page.

Documentation

All documentation can be found on doc.gitlab.com/ce/.

Getting help

Please see Getting help for GitLab on our website for the many options to get help.

Is it any good?

Yes

Is it awesome?

Thanks for asking this question Joshua. These people seem to like it.