# Conflicts:
#   app/assets/stylesheets/framework/nav.scss

Fix gfm doc typo about two spaces for next line transfer

Fixes #25148

See merge request !7915

API: Expose committer details for a commit

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22312

See merge request !7849

Patch upgrade documentation should be consulted on stable branch

Closes #25245.

See merge request !7892

Revert "Merge branch 'docs/patch-guide-link-to-old-guide' into 'master'"

Reverting in favor of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7892

See merge request !7911

This reverts merge request !7909

Link to old patch update guide now that we install workhorse with a raketask

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25284

See merge request !7909

[ci skip]

Resolve "Highlighting lines is broken"

## What does this MR do?

Add line highlighting back to diff view.  This was working in the MR "changes" tab, but not on a commit page such as https://gitlab.com/winniehell/reproduction-area/commit/9101e66f5761929002956e0f2dd65d7f8643903d

~~This MR also fixes the `scrollToElement` method in `MergeRequestTabs` to account for the extra height of the tab links which are now fixed in place once they are scrolled to the top of the screen.~~ (removed in favor of !7051)

This MR also refactors much of the `Diff` and `MergeRequestTabs` classes to es6 syntax in an effort to increase readability.

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

Check out both MR "change" tabs and commit diff pages and ensure that line highlighting works and that loading a page with one of these permalink hashes correctly highlights and scrolls to the line.

Ensure I didn't break anything in the transition to es6 syntax.  Check the functionality of the tabs on MR pages, as well as diff page interactivity (unfolding hidden lines in diff files, adding comments to diffs, etc).  I have checked these myself, but another set of eyes would be a good idea.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- Tests
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Closes #23696

See merge request !7090

If SSH prototol is disabled don't say the user requires SSH keys

Closes #24921

See merge request !7840

re-apply MR !6285 "Added forceLoad ability to singleFileDiffs, added callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found"

Use url utility to retrieve hash

temporarily revert "Added forceLoad ability to singleFileDiffs, added callback to getContentHTML, added conditional force load if a collapsed diff line anchor is found"

This reverts commit d2ee3808.

Use system font

Just for fun....   
### macOS Chrome (San Francisco):   
![Screen_Shot_2016-11-17_at_4.01.29_PM](/uploads/bfbab440ea0136314a6a7cffcd44f3ff/Screen_Shot_2016-11-17_at_4.01.29_PM.png)
### macOS Safari (San Francisco):   
![Screen_Shot_2016-11-18_at_8.28.22_AM](/uploads/3adc05d7adf84ca726cbaaf36cb0567d/Screen_Shot_2016-11-18_at_8.28.22_AM.png)
#### Ubuntu Firefox (Ubuntu): 
![Screen_Shot_2016-11-18_at_8.31.08_AM](/uploads/0f0d581d2d79d5db3dba9b2200499dc7/Screen_Shot_2016-11-18_at_8.31.08_AM.png)
#### Windows 7 IE 11 (Segoe UI): 
![Screen_Shot_2016-11-18_at_8.35.05_AM](/uploads/88efc2c554252de03fb84cc3c3e2856e/Screen_Shot_2016-11-18_at_8.35.05_AM.png)

See merge request !7545

Adds a default commit message when adding a README (#25167)

Closes #25167

See merge request !7903

Change ref property to commitRef

## What does this MR do?
Changes `ref` prop to `commitRef` because `ref` is a reserved word in Vue.js

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

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

//cc @selfup

See merge request !7901

Clean up common_utils.js

## What does this MR do?

- Remove unused functions from `common_utils.js`.
- Move functions which are used from only one file to that file.

## Why was this MR needed?

Because some utils weren't that common (anymore).

See merge request !7318

Fixes ActionView::Template::Error: undefined method `text?` for nil:NilClass

Closes #25251

See merge request !7893

Enable ColorVariable in scss-lint

## What does this MR do?

- Enable the ColorVariable rule in`.scss-lint.yml`
- Change all color literals in `app/assets/stylesheets` to color variables

## Why was this MR needed?

- Enforce the usage of color variables to better constrain the various color values being used

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


Closes #23500

See merge request !7319

Fixed row margins on Pipeline Settings page in order to unify styles

On the ```project-name/pipelines/settings``` page, I removed the ```.row``` styling on ```.build-status``` and ```.coverage-report``` as it was causing those rows to not have the same margins as the "CI/CD Pipeline" row.

Now, they are even as you can see below:

![Screen_Shot_2016-12-01_at_12_54_59_PM](/uploads/a7196ff2e8efcdcd072bc2d26634a42d/Screen_Shot_2016-12-01_at_12_54_59_PM.png)

![Screen_Shot_2016-12-01_at_12_53_18_PM](/uploads/615428bab476fcd1baab86837395d800/Screen_Shot_2016-12-01_at_12_53_18_PM.png)

Closes #25098 
cc: @filipa

See merge request !7881