delta/gitlab/gitlab-ce.git, branch update-permissions-links

Update permissons links to new page

2016-07-14T10:04:03+00:00

permissions/permissions just links to user/permissions since
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5210

Merge branch 'fix-label-reference-filter' into 'master'

2016-07-13T19:59:55+00:00


Fix markdown rendering for label references

Fixes #14424, #19753, #19760

See merge request !5224

Merge branch 'rails-4-2-7' into 'master'

2016-07-13T19:01:48+00:00


Upgrade Rails from 4.2.6 to 4.2.7.

Primarily just bug fixes.

See merge request !5236

Simplify regex for string-based multi-word label surrounded in quotes

2016-07-13T19:01:27+00:00

Revert "Merge branch '18193-developers-can-merge' into 'master' "

2016-07-13T18:57:30+00:00

This reverts commit 9ca633eb4c62231e4ddff5466c723cf8e2bdb25d, reversing
changes made to fb229bbf7970ba908962b837b270adf56f14098f.

Upgrade Rails from 4.2.6 to 4.2.7.

2016-07-13T18:15:11+00:00

Primarily just bug fixes.

Changelog: https://github.com/rails/rails/compare/v4.2.6...v4.2.7

Merge branch 'better-parallel-diff' into 'master'

2016-07-13T18:10:01+00:00


Actually render old and new sections of parallel diff next to each other

See merge request !5173

Merge branch 'dropdown-load-fix' into 'master'

2016-07-13T18:06:11+00:00


Dropdown loading time preformance fix

## What does this MR do?
Optimizes the performance of the dropdown load time by just sending the required data to load the dropdown instead of the full object

This MR aims to fix #17474 

See merge request !5113

Merge branch 'gl-importer-keeps-issue-number' into 'master'

2016-07-13T18:05:57+00:00


Keeps issue number when importing from Gitlab.com

## What does this MR do?

Keeps issue number when importing from `Gitlab.com`

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

No.

## Why was this MR needed?

With these changes we doesn't loose the issue references when importing from `GitLab.com`.

## What are the relevant issue numbers?

Closes #15235 

/cc @cpm @jweerdt

See merge request !5193

formats my test properly

2016-07-13T14:55:22+00:00