Find a file
Douwe Maan adffe47d3c Merge branch 'support-comment-parallel-diff' into 'master'
Support commenting on a diff in side-by-side view

### What does this MR do?

This MR adds support for commenting on a diff in side-by-side (aka parallel) view. It also fixes a JavaScript bug (see !779) when the comment button is clicked on a line that already has a comment.

There is an existing bug where the comment count is not updated when a new comment is added. I'll send a MR for that later.

### Why was this MR needed?

Commenting only worked in "inline" mode. Often the side-by-side view is more conducive to writing comments.

### What are the relevant issue numbers?

Closes https://github.com/gitlabhq/gitlabhq/issues/9283

### Screenshot

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/3d0a3213fde38844a681a826da18139b/image.png)

See merge request !810
2015-06-16 14:43:15 +00:00
app Merge branch 'support-comment-parallel-diff' into 'master' 2015-06-16 14:43:15 +00:00
bin Remove Guard 2015-06-03 20:45:53 -04:00
config Use explicit if. 2015-06-16 13:44:52 +02:00
db Add dashboard attribute to User model 2015-06-13 17:59:11 -04:00
doc Merge branch 'update-release-doc' into 'master' 2015-06-16 09:56:30 +00:00
docker Self build images require different build commands. 2015-06-11 16:17:30 +00:00
features Merge branch 'support-comment-parallel-diff' into 'master' 2015-06-16 14:43:15 +00:00
lib Dont set checkout sha for removed branch/tag 2015-06-15 17:54:22 +02:00
log init commit 2011-10-09 00:36:38 +03:00
public Fix 422 error page. 2015-05-13 09:41:56 +02:00
spec Merge branch 'fix-ext-issue-webbased-hooks' into 'master' 2015-06-16 11:36:31 +00:00
tmp Make sure important directories exist in git 2014-03-30 22:45:28 -04:00
vendor/assets Remove jasmine-fixture, use teaspoon fixtures 2015-05-28 18:22:32 -04:00
.foreman complete hooks for post receive 2012-01-08 13:20:20 +02:00
.gitattributes Use gitattribute merge=union to reduce CHANGELOG merge conflicts. 2015-02-12 20:50:09 +01:00
.gitignore Remove the volumes from the single image to keep it simple. 2015-05-07 10:47:24 +02:00
.gitlab-ci.yml new syntax of .gitlab-ci.yml 2015-06-15 19:38:35 +03:00
.hound.yml Make houndci prefer single quotes. 2014-07-16 09:38:42 +03:00
.pkgr.yml Use new way of defining services on packager.io 2015-01-18 17:55:48 +00:00
.rspec Remove --drb from .rspec 2014-03-24 08:55:27 -04:00
.rubocop.yml Fixed the Rails/ActionFilter cop 2015-04-20 15:39:37 +02:00
.ruby-version ruby 2.1.6 2015-04-13 22:11:09 -07:00
.simplecov organize simplecov 2013-01-07 22:23:13 +02:00
.teatro.yml teatro setup 2014-06-17 11:21:49 +03:00
CHANGELOG Support commenting on a diff in side-by-side view 2015-06-16 06:11:59 -07:00
config.ru Disable Unicorn::WorkerKiller in non-production environments 2015-05-27 22:57:49 -04:00
CONTRIBUTING.md Point people to the issue tracker on GitLab.com to prevent duplication. 2015-05-26 11:12:29 -07:00
doc_styleguide.md Added line about adding docs in alphabetical order 2015-06-08 22:28:41 +00:00
Gemfile Update Redcarpet to 3.3.0 2015-06-13 17:54:54 -04:00
Gemfile.lock Update Redcarpet to 3.3.0 2015-06-13 17:54:54 -04:00
GITLAB_SHELL_VERSION GitLab shell version to 2.6.3. 2015-05-14 09:35:34 +02:00
LICENSE LICENSE year update 2015-03-30 11:03:42 +03:00
MAINTENANCE.md Add note about semantic versioning not being absolute. 2015-01-10 21:48:35 -08:00
PROCESS.md Escape process text 2015-02-18 18:13:10 +01:00
Procfile Archive repositories in background worker. 2015-03-31 12:52:20 +02:00
Rakefile init commit 2011-10-09 00:36:38 +03:00
README.md EE can be accessed without a subscription 2015-05-22 19:03:23 +00:00
VERSION Let's start 7.12 2015-05-25 10:15:36 +00:00

Canonical source

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

logo GitLab

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

Editions

There are two editions of GitLab. GitLab Community Edition (CE) is available without any costs under an MIT license.

GitLab Enterprise Edition (EE) includes extra features that are most useful for organizations with more than 100 users. To use EE and get official support please become a subscriber.

Code status

  • build status on ci.gitlab.org (master branch)

  • Build Status

  • Code Climate

  • Coverage Status

Website

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

Requirements

GitLab requires the following software:

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

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

Installation

The recommended way to install GitLab is using the provided Omnibus packages. 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.

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

Since 2011 a minor or major version of GitLab is released on the 22nd of every month. Patch and security releases are published when needed. New features are detailed on the blog and in the changelog. For more information about the release process see the release documentation. Features that will likely be in the next releases can be found on the feature request forum with the status started and completed.

Upgrading

For updating the Omnibus installation please see the update documentation. For installations from source there is an upgrader script and there are upgrade guides detailing all necessary commands to migrate to the next version.

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.

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.