delta/gitlab/gitlab-ce.git/features, branch absorb-gitlab-git

Merge branch '24010-Add-named-anchors-for-diffs-in-the-commit-page' into 'master'

2016-11-17T10:14:55+00:00


Adds hash anchors to diff_files to make possible linking exact file in commit

Closes #24010

See merge request !7298

Merge branch 'move-snippet-discover-spinach-test-to-rspec' into 'master'

2016-11-16T14:15:41+00:00


Move 'Explore Snippets' Spinach feature to Rspec

## What does this MR do?
It moves the `features/snippets/discover.feature` Spinach test to a Rspec feature.

## Are there points in the code the reviewer needs to double check?
The original feature was called 'Discover Snippets', but the UI no longer reflects this wording. The new Rspec feature is called 'Explore Snippets' to reflect UI/Controller/View naming in use.

## Why was this MR needed?
As part of deprecating the Spinach test suite.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [-] [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
  - [x] 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)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?
#23036

See merge request !7349

Move 'Search Snippets' Spinach feature to Rspec

2016-11-16T06:52:43+00:00

This commit moves the `search_snippets.feature` Spinach test to a
Rspec feature, as part of deprecating the Spinach test suite.

- Remove Spinach discover snippets feature and steps
- Remove unused `SharedSearch` module
- Add Rspec feature scenarios

Unify anchor link format for MR diff files !7298

2016-11-15T17:51:21+00:00

Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path.
Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage.
Changes in this commit  allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format.

Inspired by #24010 and !7298

Merge branch 'dz-refactor-namespace-regex' into 'master'

2016-11-08T12:51:51+00:00


Refactor namespace regex

Reuse existing namespace regex constant in routing

See merge request !7336

Merge branch 'use-separate-token-for-incoming-email' into 'master'

2016-11-08T10:47:45+00:00


Use separate email-friendly token for incoming email

See merge request !5914

Merge branch 'fix-404-on-network-when-entering-a-nonexistent-git-revision' into 'master'

2016-11-08T09:31:43+00:00


Network page appear with an error message when entering nonexistent git revision

Closes #2362

See merge request !7172

Update non-exist group spinach test to match routing

2016-11-08T08:13:13+00:00

Signed-off-by: Dmitriy Zaporozhets

Move 'Explore Snippets' Spinach feature to Rspec

2016-11-08T06:37:02+00:00

This commit moves the `snippets/discover.feature` Spinach test to a
Rspec feature, as part of deprecating the Spinach test suite.

The original feature was called 'Discover Snippets', but the UI no
longer reflects this wording. The new Rspec feature is called
'Explore Snippets' to reflect UI/Controller/View naming in use.

- Remove Spinach discover snippets feature and steps
- Add Rspec feature test

implements reset incoming email token on issues modal and account page,

2016-11-07T15:56:18+00:00

reactivates all tests and writes more tests for it