delta/gitlab/gitlab-ce.git/spec/features, branch feature/runner-script-attempts-docs gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'dz-fix-admin-routes' into 'master' 2016-12-14T15:09:54+00:00 Sean McGivern sean@mcgivern.me.uk 2016-12-14T15:09:54+00:00 b70b962892b2428557d95a9639fbcead4fe546fd Add support for nested groups to admin routing See merge request !8008 

Add support for nested groups to admin routing

See merge request !8008
 Merge branch '25136-last-deployment-link' into 'master' 2016-12-14T08:33:05+00:00 Grzegorz Bizon grzegorz@gitlab.com 2016-12-14T08:33:05+00:00 c6d7785976bf84518e098cc168847e3e4e7e6386 Fix broken link for latest deployment ## What does this MR do? Creates a new helper for the latest deployment link. ## Why was this MR needed? A helper that returns a link was being called inside another helper that creates a link, resulting in `builds/<a href="builds/ID>#id</a>` ## What are the relevant issue numbers? Closes #25136 See merge request !7839 

Fix broken link for latest deployment

## What does this MR do?

Creates a new helper for the latest deployment link.

## Why was this MR needed?

A helper that returns a link was being called inside another helper that creates a link, resulting in  `builds/<a href="builds/ID>#id</a>`

## What are the relevant issue numbers?

Closes #25136

See merge request !7839
 Merge branch 'move-admin-settings-feature-to-rspec' into 'master' 2016-12-13T17:37:55+00:00 Rémy Coutable remy@rymai.me 2016-12-13T17:37:55+00:00 7b63587d5d8f9865408a474efef5ca6064c29155 Replace the Spinach specs for admin settings with RSpec feature specs as per #23036 Part of #23036 See merge request !8058 

Replace the Spinach specs for admin settings with RSpec feature specs as per #23036 

Part of #23036

See merge request !8058
 Move admin settings spinach feature to rspec 2016-12-13T16:13:21+00:00 jurre jurrestender+github@gmail.com 2016-12-13T10:17:32+00:00 0469e7dffd13646a211a456341c9459b8ff5f7ad 






Merge branch 'allow-more-filenames' into 'master'

2016-12-13T13:19:28+00:00

Rémy Coutable
remy@rymai.me

2016-12-13T13:19:28+00:00

0764c2ead1cc3ee3778a24218412317ba19b5e83


Allow all alphanumeric characters in file names

## What does this MR do?

Allow more characters in file names such as Chinese symbols.

## Why was this MR needed?

It is annoying that some files which can be uploaded using Git CLI cannot be created with the web editor.

## What are the relevant issue numbers?

fixes #20190

See merge request !8002





Allow all alphanumeric characters in file names

## What does this MR do?

Allow more characters in file names such as Chinese symbols.

## Why was this MR needed?

It is annoying that some files which can be uploaded using Git CLI cannot be created with the web editor.

## What are the relevant issue numbers?

fixes #20190

See merge request !8002






Add failing test for #20190
2016-12-13T08:13:06+00:00

winniehell
git@winniehell.de

2016-12-13T01:10:30+00:00

c16b24af04643edc598b20b338eff25e463ed29b












Merge branch '25286-customer-label-doesn-t-autocomplete-correctly' into 'master'

2016-12-12T23:06:24+00:00

Alfredo Sumaran
alfredo@gitlab.com

2016-12-12T23:06:24+00:00

4db62fef5365cb11e7d8fbb8b5454338fa9bc478


Correct autocomplete for values with special characters

## What does this MR do?

This adds a check for any special chars in any value passed to the `DefaultOptions.beforeInsert` callback function. If special chars are found and `skipSpecialCharTest` option is `false`, it will wrap the value in quotation marks.

This fixed autocompleting `~customer+` instead of `~"customer+"`.

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

## Why was this MR needed?

## Screenshots (if relevant)

![2016-12-03_10.37.11](/uploads/59159623638939933d23b447692775b8/2016-12-03_10.37.11.gif)

## 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
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] 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 #25286, #24961

See merge request !7910





Correct autocomplete for values with special characters

## What does this MR do?

This adds a check for any special chars in any value passed to the `DefaultOptions.beforeInsert` callback function. If special chars are found and `skipSpecialCharTest` option is `false`, it will wrap the value in quotation marks.

This fixed autocompleting `~customer+` instead of `~"customer+"`.

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

## Why was this MR needed?

## Screenshots (if relevant)

![2016-12-03_10.37.11](/uploads/59159623638939933d23b447692775b8/2016-12-03_10.37.11.gif)

## 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
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] 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 #25286, #24961

See merge request !7910






Add support for nested groups to admin routing
2016-12-11T08:30:10+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2016-12-08T18:59:41+00:00

d8b7df3cbcfd4fcdf204fdcba01720e60fb598bf

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







fix failing tests
2016-12-10T06:57:23+00:00

Mike Greiling
mike@pixelcog.com

2016-12-08T22:13:23+00:00

7f3fc26ec98193fa0c3bfeb7b78c81176bb9c689












Merge branch 'remove-your_email-gsub-in-help-page' into 'master'

2016-12-09T21:14:27+00:00

Sean McGivern
sean@mcgivern.me.uk

2016-12-09T21:14:27+00:00

4f365066330365391c11eeb408e884c021465a00


Stop replacing `$your_email` with the user's email in the `/help` pages

See merge request !8014





Stop replacing `$your_email` with the user's email in the `/help` pages

See merge request !8014