Katarzyna Kobierska
09cded29d8
Checks if deleting forked project closed all open merge requests
2016-09-13 14:40:05 +02:00
Katarzyna Kobierska
8c77a1fb25
Before deleting project if forked unlink fork
2016-09-13 14:40:05 +02:00
Robert Speicher
516100c55b
Merge branch 'add-remember-option-u2f' into 'master'
...
Pass the remember_me option into the u2f form and support it while authenticating
## What does this MR do?
Adds remember me support in the u2f authentication, and makes sure the flag gets passed from the login form to the u2f form.
Based on the changes for the same thing done for regular 2fa: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4369
## Why was this MR needed?
The remember me option wasn't working for u2f devices (yubikey)
## What are the relevant issue numbers?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18103
See merge request !5918
2016-09-09 18:42:11 +00:00
Douglas Barbosa Alexandre
d86c666662
Refresh todos count cache when an Issue/MR is deleted
2016-09-08 15:50:07 -03:00
Rémy Coutable
8aa025bb85
Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-05 17:23:32 +02:00
Airat Shigapov
b76ef40e36
Fix missing flash messages on service edit page
2016-09-05 14:13:15 +03:00
DJ Mountney
9224f031cf
Pass the remember_me option into the u2f form and support it while authenticating
...
Matches the changes done for non-u2f two-factor auth
2016-09-01 17:11:42 -07:00
Felipe Artur
892dea6771
Project tools visibility level
2016-09-01 11:47:59 -03:00
Robert Speicher
e71cd7a300
Merge branch 'refactor/add-policies' into 'master'
...
Refactor ability.rb into Policies
## What does this MR do?
Factors out `ability.rb` into a new abstraction - the "policy" (stored in `app/policies`). A policy is a class named `#{class_name}Policy` (looked up automatically as needed) that implements `rules` as follows:
``` ruby
class ThingPolicy < BasePolicy
def rules
@user # this is a user to determine abilities for, optionally nil in the anonymous case
@subject # this is the subject of the ability, guaranteed to be an instance of `Thing`
can! :some_ability # grant the :some_ability permission
cannot! :some_ability # ensure that :some_ability is not allowed. this overrides any `can!` that is called before or after
delegate! @subject.other_thing # merge the abilities (can!) and prohibitions (cannot!) from `@subject.other_thing`
can? :some_ability # test whether, so far, :some_ability is allowed
end
def anonymous_rules
# optional. if not implemented `rules` is called where `@user` is nil. otherwise this method is called when `@user` is nil.
end
end
```
See merge request !5796
2016-08-31 20:53:40 +00:00
Douglas Barbosa Alexandre
325de662ce
Don't create groups for unallowed users when importing projects
2016-08-31 12:55:45 -03:00
Stan Hu
341541d3af
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2016-08-30 14:48:17 -07:00
http://jneen.net/
5853c96b49
remove Ability.abilities
2016-08-30 11:35:06 -07:00
Katarzyna Kobierska
6b02c82cfe
Improve grammar
2016-08-30 13:05:40 +02:00
Katarzyna Kobierska
c9c2503c51
User can edit closed MR with deleted fork
...
Add test for closed MR without fork
Add view test visibility of Reopen and Close buttons
Fix controller tests and validation method
Fix missing space
Remove unused variables from test
closed_without_fork? method refactoring
Add information about missing fork
When closed MR without fork can't edit target branch
Tests for closed MR edit view
Fix indentation and rebase, refactoring
2016-08-30 13:05:40 +02:00
Douglas Barbosa Alexandre
4cccfc0f17
Fix issue boards leak private label names and descriptions
2016-08-29 16:04:28 -03:00
Stan Hu
ace38e8397
Fix external issue tracker "Issues" link leading to 404s
...
a70431f874 modified the behavior to link to the external issue tracker
issues URL instead of the project path URL. This restores the
previous behavior.
Closes #21252 , #21402
2016-08-25 14:53:17 -07:00
Z.J. van de Weg
4c8e9a8d27
Remove gitorious
2016-08-25 10:10:10 +01:00
Stan Hu
e665444724
Fix incorrect "stopped impersonation" log message
...
Closes #21015
2016-08-23 01:09:16 -07:00
Jacob Schatz
8e14a40769
Merge branch '17932-move-to-project-dropdown' into 'master'
...
Move to project dropdown with infinite scroll for better performance
## What does this MR do?
On the Move dropdown on the edit issue page we introduced infinite scrolling to just return a limited number of projects, 50 items. So if the user can move the issue to 50 or more items when scroll down on the list a new set of projects will be requested to the server.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
See #17932
## What are the relevant issue numbers?
Closes #17932
## Screenshots (if relevant)
## 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
- [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 !5686
2016-08-19 14:57:09 +00:00
Paco Guzman
ff903e6453
Move to project dropdown with infinite scroll for better performance
...
Use just SQL to check is a user can admin_issue on a project
Using offset pagination instead pages to avoid a count query
Tradeoff
- we duplicate how we check admin_issue in a SQL relation in the Ability class
2016-08-18 15:31:51 +02:00
Connor Shea
d8654744cd
Merge branch 'master' into diff-line-comment-vuejs
2016-08-17 12:10:09 -06:00
Douwe Maan
46dc00631a
Merge branch 'issue-boards' into 'master'
...
Issue boards
## What are the relevant issue numbers?
- Issue: #17907
- Issue backend: #20335
- Backend MR: !5548
- Frontend MR: !5554
- Documentation !5713
## Screenshots (if relevant)
## 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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits )
See merge request !5548
2016-08-17 18:02:26 +00:00
Douglas Barbosa Alexandre
536bdf643e
Move the set up of the state described in context to a before block
2016-08-17 12:59:00 -03:00
Douglas Barbosa Alexandre
84afd6254a
Remove # from controller actions specs
2016-08-17 12:58:59 -03:00
Douglas Barbosa Alexandre
29a91c5bc6
Fix matcher `match_response_schema`
2016-08-17 12:58:59 -03:00
Douglas Barbosa Alexandre
cd98ff179c
Move action to render board lists to `Projects::Boards::ListsController`
2016-08-17 12:58:59 -03:00
Douglas Barbosa Alexandre
57737785df
Move board related controllers to the `Boards` namespace
2016-08-17 12:58:59 -03:00
Douglas Barbosa Alexandre
8e4e294a7c
Rename from/to params to from_list_id/to_list_id
2016-08-17 12:58:59 -03:00
Douglas Barbosa Alexandre
a8b1ad250e
Add authorization to issues board related controllers
2016-08-17 12:58:59 -03:00
Douglas Barbosa Alexandre
6113767045
Add an endpoint to generate the default lists for a board
2016-08-17 12:58:59 -03:00
Douglas Barbosa Alexandre
5317f6ea94
Include the Issue#assignee in the response when listing issues
2016-08-17 12:58:58 -03:00
Douglas Barbosa Alexandre
9e5a305f18
Use zero-based positions on issues board services
2016-08-17 12:58:58 -03:00
Douglas Barbosa Alexandre
2c00d5928c
Move endpoint to list issues under lists resources
2016-08-17 12:58:58 -03:00
Douglas Barbosa Alexandre
64d7559532
Refactor spec for Projects::BoardListsController
2016-08-17 12:58:58 -03:00
Douglas Barbosa Alexandre
75f0bc4af8
Add endpoint to allow users to move issues between lists
2016-08-17 12:58:58 -03:00
Douglas Barbosa Alexandre
296bcbd664
Add endpoint to list issues for a specific board list
2016-08-17 12:58:58 -03:00
Douglas Barbosa Alexandre
547d218e6b
Add endpoint to allow users to remove lists
2016-08-17 12:58:58 -03:00
Douglas Barbosa Alexandre
0fb9210dbb
Add endpoint to allow users to move lists
2016-08-17 12:58:58 -03:00
Douglas Barbosa Alexandre
ed9943d013
Add endpoint to allow users to create a new board list
2016-08-17 12:58:58 -03:00
Douglas Barbosa Alexandre
e199884478
Projects::BoardsController#show returns a list of board lists
2016-08-17 12:58:58 -03:00
Douglas Barbosa Alexandre
a84176bada
Creates a new board when project does not have one
2016-08-17 12:58:58 -03:00
Douglas Barbosa Alexandre
7649937452
Initial issues board page
2016-08-17 12:58:58 -03:00
Sean McGivern
e6f3461c0b
Merge remote-tracking branch 'origin/master' into mc-ui
2016-08-17 16:55:28 +01:00
Connor Shea
a77629b1cb
Merge branch 'master' into diff-line-comment-vuejs
2016-08-17 09:52:39 -06:00
Paco Guzman
03386633a4
Move to project dropdown with infinite scroll for better performance
...
Use just SQL to check is a user can admin_issue on a project
Tradeoff
- we duplicate how we check admin_issue in a SQL relation in the Ability class
2016-08-17 07:33:51 +02:00
Connor Shea
1d3aa59f99
Merge branch 'master' into diff-line-comment-vuejs
2016-08-16 16:59:19 -06:00
Felipe Artur
2872672945
Load issues and merge requests templates from repository
2016-08-16 15:50:17 -03:00
Douwe Maan
41007f6d3c
Address review feedback
2016-08-16 11:04:26 -05:00
Robert Speicher
7fef2f7b75
Merge branch 'akismet-submittable' into 'master'
...
Submit to Akismet Part 1 (Issues)
Related to #5932 #5573 gitlab-com/infrastructure#14
See merge request !5538
2016-08-15 22:59:47 +00:00
Patricio Cano
5994c11910
Further refactor and syntax fixes.
2016-08-15 17:20:57 -05:00