Rémy Coutable e4a1af8353 Merge branch '12724-wrong-sorting-of-commit-order-in-mr-view' into 'master'
Resolve "Wrong sorting of commit order in MR view?"

!4052 fixed this for the most obvious cases, but there were still some problems.

Here's my test case: I have a branch where I was suffering from an unfortunate
issue. Every other commit I made had its commit date set to one day before it
should have been. (Perhaps my system clock was misbehaving.)

```shell
for i in {1..10}
do
  echo $i > $i
  git add $i
  GIT_COMMITTER_DATE=`date -v -$((i % 2))d` git commit -m $i
done
```

The git CLI still gives me the commits in the right order, but I can see that
the timestamps alternate between two values:

```shell
$ git log --format='%h %ct %p %s' master...HEAD
f0c3108 1463646313 3d38a13 10
3d38a13 1463559913 67f419b 9
67f419b 1463646313 74330c0 8
74330c0 1463559913 56361d7 7
56361d7 1463646313 ba1b60c 6
ba1b60c 1463559913 f91497d 5
f91497d 1463646313 79c5e57 4
79c5e57 1463559913 b953cef 3
b953cef 1463646313 12fc411 2
12fc411 1463559913 835715b 1
```

Unfortunately, GitLab didn't like this _at all_. Here's what the commits on my
MR from that branch looked like:
![image](/uploads/fdc38e932eeedcb77de9ec4b50ad1476/image.png)

That's because we were sorting the commits by date, which is safe if they are in
that order anyway. If they aren't, then because Ruby's sorting isn't stable, we
lose even the ordering among the correctly-ordered commits with the same
timestamp.

After these changes (and reloading the MR's diff), this looks like:
![image](/uploads/b09fb0f51359c1c89484e713e859512b/image.png)

The commits view was also wrong, but in a slightly different way. In table form:

| View | Before | After |
| --- | --- | --- |
| Commit list | 10, 8, 6, 4, 2, 9, 7, 5, 3, 1 | 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 |
| MR commits | 10, 2, 8, 4, 6, 5, 7, 3, 9, 1 | 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 |

Closes #12724

See merge request !4208
2016-05-19 19:04:29 +00:00
2016-05-07 13:29:24 +09:00
2016-05-13 17:31:58 -05:00
2016-05-19 17:30:34 +00:00
2011-10-09 00:36:38 +03:00
2016-05-17 09:41:47 -05:00
2015-10-04 13:49:48 +00:00
2012-01-08 13:20:20 +02:00
2016-03-09 20:43:54 +01:00
2016-04-21 10:52:25 -07:00
2014-07-16 09:38:42 +03:00
2015-06-26 01:01:13 -04:00
2013-01-07 22:23:13 +02:00
2014-06-17 11:21:49 +03:00
2016-01-14 15:08:22 +01:00
2016-04-19 10:36:14 +02:00

GitLab

build status Build Status Code Climate Coverage Status

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.

S
Description
No description provided
Readme MIT
170 MiB
Languages
Ruby 75.2%
Haml 10.4%
CoffeeScript 6.1%
SCSS 4.7%
Gherkin 2.4%
Other 1.2%