Commit graph

22 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
48d223d7c9 Merge branch 'issue-23306-fix' into 'master'
Add missing routes to make group edits work

6b90ccb9fd changed the routes so that users/groups can be accessed via`/:id`, but the Rails `form_for` method expects to use the `groups#show` path helper for the form action URL. This causes group edits and deletes to fail because the PUT/PATCH/DELETE methods did not exist for `/:id`.  This MR adds these methods so that `form_for` continues to work.

Closes #23306 


See merge request !6874
2016-10-14 12:25:56 +00:00
Fatih Acet
66855f6262 Merge branch 'members-ui' into 'master'
Project members UI

## What does this MR do?

New UI for project members that includes groups.

## Screenshots (if relevant)


### Project members

![Screen_Shot_2016-09-02_at_15.13.27](/uploads/b9d4a634d44b7b7bbb6eddb10aee86bd/Screen_Shot_2016-09-02_at_15.13.27.png)

### Group members

![Screen_Shot_2016-09-02_at_15.13.36](/uploads/c15c173e68b2c0b49bcd06ca560269d3/Screen_Shot_2016-09-02_at_15.13.36.png)

## What are the relevant issue numbers?

Part of #19868 

Closes #21320 

See merge request !6148
2016-10-14 12:25:23 +00:00
Dmitriy Zaporozhets
d7324f0ed5
Move edit group scenario to rspec and refactor groups_spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-14 14:51:59 +03:00
Luke Bennett
58368fbc53 Moved ci_status environments logic to new action ci_envrionments_status and set up frontend polling 2016-10-14 11:07:01 +02:00
Stan Hu
ab2a7a806a Add missing routes to make group edits work
Closes #23306
2016-10-13 23:38:50 -07:00
Sean McGivern
11e93ad59d Merge branch 'feature/issues-board' into 'master'
Refactoring Issues Board

## What does this MR do?

This MR aims to minimize conflicts between the CE issues board feature with EE multiple boards feature.

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

## Why was this MR needed?

To avoid a lot of conflicts with EE multiple boards feature.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~
- [ ] ~~[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)
- [ ] 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?

https://gitlab.com/gitlab-org/gitlab-ee/issues/929

https://gitlab.com/gitlab-org/gitlab-ee/issues/1084

See merge request !6727
2016-10-13 14:21:14 +00:00
Sean McGivern
d3a9838065 Merge branch 'download_snippets' into 'master'
Added 'Download' button to snippet view

## What does this MR do?

Adds a `Download` button above a snippet.

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

## Why was this MR needed?

Requested in #22811 

## Screenshots (if relevant)

![image](/uploads/59b67aa02cc601c08a18fd60c37797ed/image.png)

## Does this MR meet the acceptance criteria?

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

See merge request !6720
2016-10-12 08:22:38 +00:00
Justin DiPierro
32186b4ab8 Added 'Download' button to snippet view 2016-10-11 15:36:59 -04:00
Douwe Maan
d57d892e3f Merge branch 'assign-issues-for-merge-request-18876' into 'master'
Ability to bulk assign issues to author of merge request

## What does this MR do?
Provides a link to auto-assign issues to the author of a merge request, when they are mentioned as being closed by the MR.

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


## Why was this MR needed?
To help avoid working on a MR without having assigned related issues to self

## What are the relevant issue numbers?
Fixes #18876 

## Screenshots (if relevant)
![ScreenShot-P216](/uploads/1af5e71a0a0ff0a60c5d7b54c0e09d9c/ScreenShot-P216.png)

## Tasks
- [x] Refactor or move away from using `BulkUpdateService`
- [x] ~~Consider alternate link message when only a subset of issues will be assigned~~
- [x] Minimize repeated calls to expensive `closes_issues` method
- [x] Move away from using inflector for pluralization and fix flash message
- [x] Change auth `before_action` and fallback to error flash message
- [x] Shouldn't overwrite current assignee if one exists

## 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
  - [x] All builds are passing
- [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)

See merge request !5725
2016-10-11 17:20:38 +00:00
Douglas Barbosa Alexandre
ecf4c10e9c Add index action to Projects::BoardsController to return project boards 2016-10-11 11:39:05 -03:00
Robert Speicher
5c6cbfa6cb Merge branch 'atom-routes' into 'master'
Allow browsing branches that end with '.atom'

## What does this MR do?

1. Simplify the regex capture in the routing for the CommitsController
   to not exclude the '.atom' suffix. That's a perfectly valid git
   branch name, so we shouldn't blow up if we get it.
2. Because Rails now can't automatically detect the request format, add
   some code to do so in `ExtractPath` when there is no path. This means
   that, given branches 'foo' and 'foo.atom', the Atom feed for the
   former is unroutable. To fix this: don't do that! Give the branches
   different names!

## Why was this MR needed?

Creating a branch or tag name ending in '.atom' would cause some 500s on that repo.

## What are the relevant issue numbers?

Closes #21955. Related to !5994.

See merge request !6750
2016-10-11 14:04:31 +00:00
Sean McGivern
1022456bb1 Allow browsing branches that end with '.atom'
We need to do two things to support this:

1. Simplify the regex capture in the routing for the CommitsController
   to not exclude the '.atom' suffix. That's a perfectly valid git
   branch name, so we shouldn't blow up if we get it.
2. Because Rails now can't automatically detect the request format, add
   some code to do so in `ExtractPath` when there is no path. This means
   that, given branches 'foo' and 'foo.atom', the Atom feed for the
   former is unroutable. To fix this: don't do that! Give the branches
   different names!
2016-10-11 13:31:12 +01:00
Stan Hu
e72f2cfcb2 Fix missing constraints causing route failures when usernames with periods are used
Closes #23131
2016-10-08 09:58:25 -07:00
Dmitriy Zaporozhets
6b90ccb9fd Change user & group landing page routing from /u/:name & /groups/:name to /:name
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-06 19:50:48 +03:00
Fatih Acet
9a13f885a9 Merge branch 'issue-boards-new-issue' into 'master'
Issue boards new issue form

## What does this MR do?

Adds a new issue form into the issue boards lists.

## Screenshots (if relevant)

![Screen_Shot_2016-10-03_at_14.57.30](/uploads/17fe6cd37bd020a2ee1688e0b496c18f/Screen_Shot_2016-10-03_at_14.57.30.png)

![Screen_Shot_2016-10-03_at_14.57.32](/uploads/c3f12bcb9ff9a0e7ce5b0bb06dfb0dd7/Screen_Shot_2016-10-03_at_14.57.32.png)

## What are the relevant issue numbers?

Part of #21219

See merge request !6653
2016-10-06 14:49:59 +00:00
Phil Hughes
996e802415 Merge branch 'master' into members-ui 2016-10-06 15:30:34 +01:00
James
492b4332a4 Added link to bulk assign issues to MR author. (Issue #18876) 2016-10-06 13:37:37 +01:00
Phil Hughes
4d9f76c151 Added ability to save the new issue 2016-10-06 11:00:01 +01:00
Paco Guzman
ca3c0c6cd9 MergeRequest new form load diff asynchronously 2016-10-06 11:19:14 +02:00
Dmitriy Zaporozhets
b9e259dded
Cleanup config/routes.rb even further by extracting more routes into separate files
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-05 18:43:47 +03:00
Dmitriy Zaporozhets
b3151828e7
Put user keys routing back below project routing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-05 16:05:26 +03:00
Dmitriy Zaporozhets
f223a41660
Split routes on multiple files
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-05 15:21:27 +03:00