Commit graph

27 commits

Author SHA1 Message Date
Yorick Peterse
717b8a7692 Merge branch 'add-project-import-data-index' into 'master'
Add an index for project_id in project_import_data to improve

See merge request !7316
2016-11-07 11:06:35 +00:00
Rémy Coutable
9c00e76567 Merge branch 'api-priority-labels' into 'master'
Exposes the label priority to the API. Furthermore, it allows the user to modify the priority via the API.

Closes #21269

See merge request !7286
2016-11-07 09:22:58 +00:00
Robert Schilling
76c237460a Ability to update labels priority via API 2016-11-07 09:26:57 +01:00
Sam Rose
0c36b810ab Fix broken link to observatory cli on Frontend Dev Guide 2016-11-06 22:43:16 -05:00
Stan Hu
a8f2fceadd Add an index for project_id in project_import_data to improve
performance

We see that many slow queries on GitLab.com are dominated by finding
the project import data for a specific project. Adding an index is
the most straightforward way of fixing this.

Closes #23748
2016-11-06 14:00:09 -08:00
Sean McGivern
d0b28cd061 Merge branch 'issue_23032' into 'master'
Allow to test JIRA service when project does not have repository

closes #23032

See merge request !7162
2016-11-04 19:34:24 +00:00
Rémy Coutable
86b8fb4e7f Merge branch 'show-status-from-branch' into 'master'
Show pipeline status from branch and commit than only commit

Closes #23615

See merge request !7034
2016-11-04 17:38:25 +00:00
Douwe Maan
d12e764744 Merge branch '20968-add-setting-to-check-unresolved-discussion' into 'master'
Add setting to only allow merge requests to be merged when all discussions are resolved

_Originally opened at !6385 by @rodolfoasantos._

- - -

## What does this MR do?
Based on #20968 this merge request adds setting only to allow merge requests to be merged when all discussions are resolved. 

## Are there points in the code the reviewer needs to double check?
Check if there are other points to add the resolved discussion setting

## Why was this MR needed?
Add the possibility to configure the project to only accept merge request when all discussions are resolved

## Screenshots

![only_allow_merge_if_all_discussions_are_resolved](/uploads/9388db9421da0214590ffab6fb29f985/only_allow_merge_if_all_discussions_are_resolved.png)

![only_allow_merge_if_all_discussions_are_resolved_msg](/uploads/b1bba0c72ad67d3a1b34718baa08526e/only_allow_merge_if_all_discussions_are_resolved_msg.png)

## 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
  - [ ] 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 you do - 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 #20968

See merge request !7125
2016-11-04 15:22:36 +00:00
Lin Jen-Shin
b9b508ad05 Remove author according to the document
https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/changelog.md
2016-11-04 22:43:02 +08:00
Lin Jen-Shin
fb9a0e5277 Merge remote-tracking branch 'upstream/master' into show-status-from-branch
* upstream/master: (35 commits)
  Only skip group when it's actually a group in the "Share with group" select
  Fix: Todos Filter Shows All Users
  Fix: Guest sees some repository details and gets 404
  Move shared params to a helper
  GrapeDSL for project hooks
  Update commits.scss
  updated styling commit SHA on branches page + added to changelog
  change build list height to show 6,5 builds + improve padding of list, with first/last child selectors
  Ignore builds directory from eslint
  Add changelog entry
  Document multiple repository storage paths
  Allow multiple repository storage shards to be enabled, and automatically round-robin between them
  Cleaned up global namespace JS
  Add tip for using Chrome to run and debug teaspoon tests.
  Add CHANGELOG entry file
  Add jquery.timeago.js to application.js
  Update match-regex to fix filename convention
  Move jquery.timeago to vendor directory
  Change a bunch of doc links to either relative or https://docs.gitlab.com.
  Show log corresponding to env in admin/logs
  ...
2016-11-04 22:37:44 +08:00
Felipe Artur
8c2143a0a7 Allow to test JIRA service when project does not have repository 2016-11-04 12:24:17 -02:00
Sean McGivern
b2bbac8850 Merge branch '22588-todos-filter-shows-all-users' into 'master'
Fix: Todos Filter Shows All Users

Closes #22588

See merge request !7258
2016-11-04 14:19:14 +00:00
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
Valery Sizov
b7dff1b072 Fix: Todos Filter Shows All Users 2016-11-04 13:41:14 +02: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
Lin Jen-Shin
ce1dc4c25d Update for CHANGELOG 2016-11-04 02:51:22 +08: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