Commit Graph

41309 Commits

Author SHA1 Message Date
Rémy Coutable 632450a4bd Merge branch 'api-cherry-pick' into 'master'
Adds the ability to cherry pick a commit via the API. Right now it only supports to directly cherry pick a commit and not starting a MR from it. Shall we do that also for the API?

Closes #25450

See merge request !8047
2016-12-13 19:23:34 +00:00
Rémy Coutable 75f9c98930 Merge branch 'jzinn/gitlab-ce-chomp-git-status-message' into 'master'
For single line Git commit messages, the close quote should be on the same line as the open quote

_Originally opened at !7299 by @jzinn._

- - -

## What does this MR do?

Chomps merge commit messages so that there is not a dangling close quote.

A better solution would be not to use quotes at all, but to set off the message in a `<div>` with a background color.

## Screenshots (if relevant)

![Screen_Shot_2016-11-04_at_8.06.54_PM](/uploads/6e749c5227d88a9bfea64e70cccaf14a/Screen_Shot_2016-11-04_at_8.06.54_PM.png)

See merge request !7975
2016-12-13 19:15:07 +00:00
Sean McGivern e3231cc297 Merge branch '25482-fix-api-sudo' into 'master'
API: Memoize the current_user so that the sudo can work properly

Closes #25482

See merge request !8017
2016-12-13 18:58:23 +00:00
Rémy Coutable 7b63587d5d Merge branch 'move-admin-settings-feature-to-rspec' into 'master'
Replace the Spinach specs for admin settings with RSpec feature specs as per #23036 

Part of #23036

See merge request !8058
2016-12-13 17:37:55 +00:00
Rémy Coutable 75b0627fd4 Merge branch 'api-simple-group-project' into 'master'
API: Ability to get group's project in simple representation

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

See merge request !8060
2016-12-13 16:52:42 +00:00
jurre 0469e7dffd Move admin settings spinach feature to rspec 2016-12-13 17:13:21 +01:00
Robert Schilling 51cfd554af Make rubocop happy 2016-12-13 16:12:48 +01:00
Robert Schilling 1a81fcfbd8 API: Ability to cherry-pick a commit 2016-12-13 16:12:40 +01:00
Dmitriy Zaporozhets 921673b0da Merge branch 'dz-create-routes-lower-index' into 'master'
Add index to routes table on lower path for postgresql

Improve performance of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121 

See merge request !8041
2016-12-13 14:57:22 +00:00
Rémy Coutable d95b709a66
Be smarter when finding a sudoed user in API::Helpers
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-12-13 15:53:00 +01:00
Rémy Coutable 0764c2ead1 Merge branch 'allow-more-filenames' into 'master'
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
2016-12-13 13:19:28 +00:00
Fatih Acet 8f299a5825 Merge branch '25518-uniquely-style-labels' into 'master'
added border-radius and padding to labels

## What does this MR do?

It creates a pill like style for labels.

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

## Why was this MR needed?
get a unique label look/style


## Screenshots (if relevant)
![image](/uploads/2cf347984ae4e36cd061c5a761ee99c9/image.png)
![image](/uploads/c23bbeba4b2525b4f36dac5a0fa1037c/image.png)


## 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 #25518

See merge request !8054
2016-12-13 13:15:34 +00:00
Sean McGivern bd219711b9 Merge branch 'dz-nested-group-improvements-2' into 'master'
Minor improvements to nested groups code

See merge request !8011
2016-12-13 13:04:11 +00:00
Robert Schilling 7841be243e API: Ability to get group's project in simple representation 2016-12-13 13:54:36 +01:00
Dmitriy Zaporozhets ec25abe625
Add AddLowerPathIndexToRoutes to setup_postgresql.rake
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-12-13 14:48:02 +02:00
Julian Zinn 549242c620 For single line git commit messages, the close quote should be on the same line as the open quote
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-12-13 13:36:49 +01:00
Sean McGivern 0139896b37 Merge branch '3478-copy-commit-hash-to-clipboard' into 'master'
Copy commit hash to clipboard

Closes #3478 

See merge request !8020
2016-12-13 12:06:36 +00:00
Fatih Acet f4dde5d564 Merge branch '24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-image' into 'master'
Add image controls to MR diffs

## What does this MR do?

Instantiates `ImageFile` in `Diff` which is instantiated in `MergeRequestTabs`.

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

## Why was this MR needed?

## Screenshots (if relevant)

![Screen_Shot_2016-12-04_at_11.11.21](/uploads/738c68ad3fa682c1c132421abce7165e/Screen_Shot_2016-12-04_at_11.11.21.png)

## 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 #24949

See merge request !7919
2016-12-13 12:05:09 +00:00
Sean McGivern 0b451ffc73 Merge branch 'issue_13270' into 'master'
Allow to delete tag release note

closes #13270

See merge request !8001
2016-12-13 11:43:15 +00:00
Dimitrie Hoekstra 9d097ebdb5 added border-radius and padding to labels 2016-12-13 14:29:49 +03:00
Sean McGivern a9da7e60ef Merge branch 'api-dont-allow-blank-mr-titles' into 'master'
Don't allow blank MR titles in API

Closes #25033

See merge request !7848
2016-12-13 11:04:06 +00:00
Sean McGivern 9a3c53fd4e Merge branch 'fix-autoloading-issue' into 'master'
Don't require `API::API` in routes

Closes #18312.

See merge request !8045
2016-12-13 09:16:45 +00:00
winniehell 61aa90ef20 Allow all alphanumeric characters in file names (!8002) 2016-12-13 09:13:06 +01:00
winniehell c16b24af04 Add failing test for #20190 2016-12-13 09:13:06 +01:00
Robert Schilling 2cbd07e69c Don't allow blank MR titles in API 2016-12-13 09:01:48 +01:00
Alfredo Sumaran d8d07976ec Merge branch 'awards_handler-fixture' into 'master'
Replace static fixture for awards_handler_spec

## What does this MR do?

Use the already existing dynamic fixture `issues/open-issue.html` (!6059) in `awards_handler_spec.js` instead of the static fixture `awards_handler.html.haml`.

## What are the relevant issue numbers?

#24753

See merge request !7661
2016-12-13 00:58:16 +00:00
Stan Hu 7c9fdbbf54 Merge branch 'patch-8' into 'master'
Fix Crontab typo for PruneOldEventsWorker to run 4x/day instead of 60x/hour

In c0a92cb8 the intended cron setting (per the comment) was to be "4 times a day", a * instead of a 0 means it runs 60x/hr 4x/day.

Closes #25571

See merge request !8051
2016-12-13 00:11:08 +00:00
Alfredo Sumaran e9759570e8 Merge branch 'fix-eslint-warnings' into 'master'
Fixed lint warning and propose fail or warning

## What does this MR do?

1. Fixes a linter warning that is currently on `master`.

2. Proposes the use of `--max-warnings 0` with `eslint` to make sure the CI build fails on any warnings.

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

## Why was this MR needed?

## 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
  - [ ] 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?

See merge request !8025
2016-12-13 00:02:58 +00:00
Fatih Acet c94ae31c1b Merge branch '25155-fix-edited-text-in-comments' into 'master'
break comment "edited at" block out of the note-text element to prevent issues w…

## What does this MR do?

Moves "edited" text below a note into its own element apart from rendered markdown to prevent issues when it is preceded by an inline text node.

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

to reproduce the bug, add text immediately following an image in a note's markdown like so:

```markdown
![foo](/uploads/c6f86574e5c3b5b73e91eeccbcb06fe6/foo.png) test text here
```

then edit and save the note.


## Why was this MR needed?

## Screenshots (if relevant)

Before:  
![Screen_Shot_2016-12-12_at_1.01.59_PM_copy](/uploads/c6f86574e5c3b5b73e91eeccbcb06fe6/Screen_Shot_2016-12-12_at_1.01.59_PM_copy.png)

After:  
![Screen_Shot_2016-12-12_at_1.00.47_PM_copy](/uploads/7a6d86d1c415114b05b4c7b662f97e93/Screen_Shot_2016-12-12_at_1.00.47_PM_copy.png)

## 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
- [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 #25155

See merge request !8048
2016-12-12 23:25:34 +00:00
Alfredo Sumaran 4db62fef53 Merge branch '25286-customer-label-doesn-t-autocomplete-correctly' into 'master'
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
2016-12-12 23:06:24 +00:00
winniehell f21e13ae19 Replace static fixture for awards_handler_spec (!7661) 2016-12-12 23:17:25 +01:00
Jon Bailey 53dc398bd6 Crontab typo '* */6' -> '0 */6' (4x/day not 1x-per-min-for-1h 4x/day) 2016-12-12 20:31:04 +00:00
Alfredo Sumaran 0d04db92ef Merge branch '19550-fix-contributer-graph-duplicates' into 'master'
Resolve "contributor emails in contributors graphs is case sensitive"

## What does this MR do?

changes author email to a case insensitive comparison so emails like "Somebody@foo.com" and "somebody@foo.com" are treated as a single author in contribution graphs.

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

should be pretty simple

## Why was this MR needed?

see above description

## Screenshots (if relevant)

#### before:
![before](/uploads/873a073e8d31e1094da6f050ba3e3f51/before.png)

#### after:
![after](/uploads/b9e534755615994f3e58442141c17f86/after.png)


## 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~~
- [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 #19550

See merge request !8021
2016-12-12 20:13:14 +00:00
Victor Wu 602447a399 Fix test 2016-12-12 13:16:52 -06:00
victorwu a6ca5689b0 Tweak style and add back wording 2016-12-12 13:16:52 -06:00
victorwu 569645a809 Clean up commit copy to clipboard and make consistent 2016-12-12 13:16:52 -06:00
Mike Greiling e8d1c7a5b6 break comment "edited at" block out of the note-text element to prevent issues with inline text nodes 2016-12-12 13:03:22 -06:00
Fatih Acet b544ec8670 Merge branch '25106-hide-issue-mr-button-for-not-loggedin' into 'master'
hide new  issue or MR button for not signed users for a group

## What does this MR do?
This MR prevents user creating issues or MR without signing in

## Are there points in the code the reviewer needs to double check?
NR
## Why was this MR needed?
This issue is needed to ensure an user to be logged in before creating an issue or MR
## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- Tests
  - [x] All builds are passing
- [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 #25106

See merge request !7902
2016-12-12 18:50:37 +00:00
Fatih Acet 01b767bd98 Merge branch '19990-update-snippets-page-design' into 'master'
Resolve "Updated UI for Snippets pages"

## What does this MR do?

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

## Why was this MR needed?

## 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
  - [ ] 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 #19990

See merge request !7861
2016-12-12 18:06:20 +00:00
Rémy Coutable 927a75567a Merge branch 'grapify-service-api' into 'master'
Grapify the service API

Related to #22928 

See merge request !7970
2016-12-12 17:54:00 +00:00
Alfredo Sumaran 61844de497 Merge branch '25429-fix-awkward-wording-in-cherry-pick-and-revert-errors' into 'master'
Resolve "Fix awkward wording in "cherry-pick" and "revert" errors."

## What does this MR do?

Fixes a poorly worded error message as well as some other minor bugs I encountered while investigating #21812.

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

Should be pretty straight forward.

## Why was this MR needed?

## 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
  - [ ] ~~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?

Originally a part of #21812
Closes #25429

See merge request !7981
2016-12-12 17:52:18 +00:00
Rémy Coutable d6fb30eb4f Merge branch 'cs-update-sidekiq-427' into 'master'
Update Sidekiq from 4.2.1 to 4.2.7.

Includes various bug fixes, mostly for Rails 5.

Changelog: fc168fe393/Changes.md

See merge request !8032
2016-12-12 17:46:26 +00:00
Fatih Acet 407adb9e95 Merge branch '25483-broken-tabs' into 'master'
Fix TypeError: Cannot read property 'initTabs'

## What does this MR do?
Adds a default value to the `options` argument in order to prevent errors when `Pipelines` is initialised without arguments.
Adds tests to guarantee this does not happen again.

Adds back removed pipeline class to make the pipeline graph visible, `js-pipeline-graph`

## Why was this MR needed?
In the places where `Pipelines` is initialised without arguments it throws an error: `TypeError: Cannot read property 'initTabs'`


## 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
  - [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?
Closes #25483 
Closes #25493 

See merge request !8009
2016-12-12 17:44:10 +00:00
Felipe Artur ac00009fcc Allow to delete tag release note 2016-12-12 15:31:14 -02:00
Rémy Coutable c1518a3230
Don't require `API::API` in routes
`API::API` is autoloaded and shouldn't be required in non-autoloaded
code. Otherwise, we get the following dreaded error:

  A copy of API::Helpers has been removed from the module tree but is
  still active!

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-12-12 18:17:21 +01:00
Gabriel Mazetto 3445136b9b Merge branch 'unescape-relative-path' into 'master'
Avoid escaping relative links in Markdown twice

## What does this MR do?

Avoid escaping relative links in Markdown twice.

## Why was this MR needed?

Relative links with special characters (e.g. spaces) were escaped twice.

## What are the relevant issue numbers?

closes #25191, #25318

See merge request !7940
2016-12-12 17:15:40 +00:00
Fatih Acet df629173d9 Merge branch '24807-stop-ddosing-ourselves' into 'master'
Stop DDOSing ourselves

## What does this MR do?

Adds `hiddenInterval` to `SmartInterval` settings. This will be the interval used whilst the tab is inactive. If this setting is not set it will `cancel` as it would have done before.

Adds `immediateExecution` to `SmartInterval` settings. This boolean will dictate whether to execute the callback once before the first interval or not.

Uses `SmartInterval` with the new `hiddenInterval` settings to slow the polling for the MR widget on inactive tabs.

Fixes issue where `SmartInterval`s `visibilitychange` listeners are not getting called because jQuery doesn't support them.

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

## Why was this MR needed?

We're ddosing ourselves on the MR page.

## Screenshots (if relevant)

![Screen_Shot_2016-11-25_at_18.36.25](/uploads/c4457c55872f592e921a50cf5462022e/Screen_Shot_2016-11-25_at_18.36.25.png)

~30 seconds difference between the first 2 requests _(a couple requests had fired already so it's backed off already)_.

_-changed to different tab-_

~2 minutes difference between the middle 2 requests.

_-changed tab back to MR-_

~10 seconds difference between the last 2 requests.

## 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
  - [x] Added for this feature/bug
  - [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 #24807

See merge request !7762
2016-12-12 15:45:54 +00:00
Dmitriy Zaporozhets 211f019382
Add index to routes table on lower path for postgresql
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-12-12 16:34:47 +02:00
Rémy Coutable 7e9a8bb760 Merge branch 'api-fix-group-projects-filter' into 'master'
API: Add the project filter to the groups endpoint.

Related to #22928. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25420

See merge request !8034
2016-12-12 14:10:22 +00:00
winniehell 17e3d3fde8 Avoid escaping relative links in Markdown twice (!7940) 2016-12-12 14:45:08 +01:00