Commit Graph

13 Commits

Author SHA1 Message Date
Rodolfo Santos 1db9f826c1 Add setting to only allow merge requests to be merged when all discussions are resolved
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-04 14:58:40 +01:00
Robert Speicher a3cc2f1e8d Merge branch '23961-can-t-share-project-with-groups' into 'master'
Only skip group when it's actually a group in the "Share with group" select

Fixes #23961

See merge request !7262
2016-11-04 13:46:21 +00:00
Sean McGivern 856ef3c303 Merge branch '24056-guest-sees-some-project-details-and-gets-404' into 'master'
Fix: Guest sees some repository details and gets 404

Closes #24056

See merge request !7222
2016-11-04 12:22:46 +00:00
Rémy Coutable 5f1d3ec59a Only skip group when it's actually a group in the "Share with group" select
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-04 12:42:19 +01:00
Douwe Maan 5ef2bd192a Merge branch '24059-round-robin-repository-storage' into 'master'
Resolve "Introduce round-robin project creation to spread load over multiple shards"

## What does this MR do?

Allow multiple shards to be enabled in the admin settings page, balancing project creation across all enabled shards.

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

* `f.select ..., multiple: true` isn't the most beautiful UI in the world, but switching to `collection_check_boxes` (or a facsimile thereof) isn't trivial
* Should `pick_repository_storage` be a method of `ApplicationSetting`, or `Project`? It's going to accrete logic over time so perhaps it should be its own class already?
* This is written to avoid the need for a database migration, so it is`serialize :repository_storage` without `, Array`. This is tested, but alternatives include:
  * Add a database migration
  * Write a custom Coder that will accept a String or Array in `load` and always `dump an Array.

## Why was this MR needed?

## Screenshots (if relevant)

![Screen_Shot_2016-11-03_at_14.42.41](/uploads/7de15d6c1b3fa60bb7a34d6a7d9f00ce/Screen_Shot_2016-11-03_at_14.42.41.png)

## Does this MR meet the acceptance criteria?

- [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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
  - [ ] 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 #24059

See merge request !7273
2016-11-04 11:37:49 +00:00
Valery Sizov dcd70453a4 Fix: Guest sees some repository details and gets 404 2016-11-04 13:06:48 +02:00
Rémy Coutable 73ab9ba5f4 Merge branch '22947-fix_issues_atom_feed_url' into 'master'
Issues atom feed url reflect filters on dashboard

Makes the issue atom feed url reflect the selected filters on the issue dashboard page and project's issues page.

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

The solution isn't based on javascript and filters functionality but on the current url parameters. It didn't seem right especially when writing tests.

## Why was this MR needed?

After filtering the issues, users may press the feed button and see a different list of issues to what is shown on the HTML page

Closes #22947

See merge request !7259
2016-11-04 11:01:27 +00:00
Nick Thomas a3847fa091 Add changelog entry 2016-11-04 04:01:08 +00:00
Alfredo Sumaran 99a000da34 Add CHANGELOG entry file 2016-11-03 21:31:11 -05:00
Rémy Coutable 46689162a3 Ensure merge request's "remove branch" accessors return booleans
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-03 18:29:00 +01:00
Lucas Deschamps d84eb9abd6 Issues atom feed url reflect filters on dashboard
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-03 18:26:06 +01:00
Robert Speicher 107953532b Add changelogs/unreleased/.gitkeep
See gitlab-org/release-tools!29

[ci skip]
2016-09-09 14:37:25 -04:00
Robert Speicher 5c35e166bf Archive CHANGELOG entries prior to 8.0 in changelogs/archive.md
[ci skip]
2016-09-09 14:36:01 -04:00