delta/gitlab/gitlab-ce.git/spec/features, branch test-gitlab-git

Merge branch 'file-content-highlight-line' into 'master'

2016-08-16T20:36:31+00:00


Highlight empty lines

## What does this MR do?

Rather than just highlight the text, file line highlighting now highlights the full line including empty lines

## What are the relevant issue numbers?

Closes #19484 

## Screenshots (if relevant)

![Screen_Shot_2016-07-05_at_13.52.31](/uploads/d3bddc918d731681465381e96c0aa2b0/Screen_Shot_2016-07-05_at_13.52.31.png)

See merge request !5092

Merge branch 'issue_18656' into 'master'

2016-08-16T19:32:41+00:00


Load issue templates from repository

part of #18656 


## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [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 you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4981

Load issues and merge requests templates from repository

2016-08-16T18:50:17+00:00

Merge remote-tracking branch 'origin/master' into ee-581-backport-changes

2016-08-16T18:21:22+00:00

Merge remote-tracking branch 'dev/master'

2016-08-16T17:24:03+00:00

Backport EE assertions in protected branch related specs.

2016-08-16T16:49:49+00:00

- Use assertions in the vein of `merge_access_levels.map(&:access_level)`
  instead of `merge_access_levels.first.access_level`

Revert "Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'"

2016-08-16T16:14:54+00:00

This reverts merge request !5417

Don't select an access level if already selected.

2016-08-16T05:44:45+00:00

1. This is in regard to the protected branches feature spec.

2. For example, if "Masters" is already selected, don't re-select
   "Masters" during the spec.

3. This is due to a bug in the frontend implementation, where selecting
   an already-selected access level _deselects_ it, which is something
   we don't need. I'll create a separate issue for this.

4. This hasn't turned up before, because we were manually creating
   missing access levels prior to e805a64. Now, we just use nested
   attributes, and missing access levels fail validation.

Backport changes from gitlab-org/gitlab-ee!581 to CE.

2016-08-16T05:35:14+00:00

!581 has a lot of changes that would cause merge conflicts if not
properly backported to CE. This commit/MR serves as a better
foundation for gitlab-org/gitlab-ee!581.

= Changes =

1. Move from `has_one {merge,push}_access_level` to `has_many`, with the
   `length` of the association limited to `1`. This is _effectively_ a
   `has_one` association, but should cause less conflicts with EE, which
   is set to `has_many`. This has a number of related changes in the
   views, specs, and factories.

2. Make `gon` variable loading more consistent (with EE!581) in the
   `ProtectedBranchesController`. Also use `::` to prefix the
   `ProtectedBranches` services, because this is required in EE.

3. Extract a `ProtectedBranchAccess` concern from the two access level
   models. This concern only has a single `humanize` method here, but
   will have more methods in EE.

4. Add `form_errors` to the protected branches creation form. This is
   not strictly required for EE compatibility, but was an oversight
   nonetheless.

Merge branch '19957-write-tests-for-adding-comments-for-different-line-types-in-diff' into 'master'

2016-08-15T22:22:51+00:00


Add rspec feature tests for the diff notes feature.

## What are the relevant issue numbers?

Closes #19957.

See merge request !5417