delta/gitlab/gitlab-ce.git, branch explicit-arguments-on-diff_file_html_data

Avoid commit lookup on diff_helper

2016-08-10T11:09:07+00:00

Removed extra newline from redis_spec.rb

2016-08-10T11:05:41+00:00

Merge branch 'zj-import-gitlab-fa-icon' into 'master'

2016-08-10T10:08:17+00:00


Use FA GitLab Icon for import project button

Before:

![Screen_Shot_2016-08-08_at_09.43.47](/uploads/e419dc0d229ff848294cf277ffbb02f9/Screen_Shot_2016-08-08_at_09.43.47.png)

After:

![Screen_Shot_2016-08-08_at_09.43.09](/uploads/3a77c5e98385bbc1c7139300eeca5866/Screen_Shot_2016-08-08_at_09.43.09.png)

See merge request !5702

Remove duplicate link_to statements

2016-08-10T09:10:04+00:00

Merge branch 'link-to-gdk-howtos' into 'master'

2016-08-10T06:31:04+00:00


Link to doc root, not readme of GDK

I hope this makes navigation between gitlab-ce developer docs and GDK docs more smooth.

See merge request !5716

Merge branch 'api-examples-curl-long-options' into 'master'

2016-08-10T06:12:27+00:00


Use long options for curl examples in documentation

## What does this MR do?

Use long options (e.g. `--header` instead of `-H`) for curl examples in documentation.

## Why was this MR needed?

Short options are less readable.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5465#note_13603730


See merge request !5703

Merge branch 'default-label-documentation' into 'master'

2016-08-10T05:46:43+00:00


Clarify the features for generating default label sets

## What does this MR do?

* Split out the information regarding the label set that GitLab can generate
* Add information for the labels view in the Admin panel

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

* Please ensure that the newly added section relating to the Admin area seems relevant
* Please verify adherence to the documentation styleguide

## Why was this MR needed?

Documentation regarding default label sets was missing

## What are the relevant issue numbers?
Closes #1865

See merge request !5736

Merge branch 'rs-rename-run-helper' into 'master'

2016-08-10T00:19:28+00:00


Rename `run` task helper method to prevent conflict with StateMachine

This prevents the following message from appearing whenever running a
Rake task:

    Instance method "run" is already defined in Object, use generic
    helper instead or set StateMachines::Machine.ignore_method_conflicts
    = true.

See merge request !5750

Merge branch 'add-caching-for-project-count' into 'master'

2016-08-09T23:49:12+00:00


Add a method in Project to return a cached value of total count of projects

This is in preparation to address the DB load caused by the counting
in gitlab-com/infrastructure#303.

See merge request !5746

Merge branch 'adambuckland/gitlab-ce-19727-sort-submodules-with-files'

2016-08-09T23:45:25+00:00