merge with branch 2.0.0-m3

This commit is contained in:
Sebastian Sdorra
2018-10-24 11:50:29 +02:00
80 changed files with 3465 additions and 1148 deletions

View File

@@ -6,7 +6,7 @@ import type { Action } from "@scm-manager/ui-components";
import type {
PermissionCollection,
Permission,
PermissionEntry
PermissionCreateEntry
} from "@scm-manager/ui-types";
import { isPending } from "../../../modules/pending";
import { getFailure } from "../../../modules/failure";
@@ -222,7 +222,7 @@ export function modifyPermissionReset(namespace: string, repoName: string) {
// create permission
export function createPermission(
link: string,
permission: PermissionEntry,
permission: PermissionCreateEntry,
namespace: string,
repoName: string,
callback?: () => void
@@ -259,7 +259,7 @@ export function createPermission(
}
export function createPermissionPending(
permission: PermissionEntry,
permission: PermissionCreateEntry,
namespace: string,
repoName: string
): Action {
@@ -271,7 +271,7 @@ export function createPermissionPending(
}
export function createPermissionSuccess(
permission: PermissionEntry,
permission: PermissionCreateEntry,
namespace: string,
repoName: string
): Action {

View File

@@ -656,7 +656,7 @@ describe("permissions selectors", () => {
it("should return true, when createPermission is true", () => {
const state = {
permissions: {
["hitchhiker/puzzle42"]: {
"hitchhiker/puzzle42": {
createPermission: true
}
}
@@ -667,7 +667,7 @@ describe("permissions selectors", () => {
it("should return false, when createPermission is false", () => {
const state = {
permissions: {
["hitchhiker/puzzle42"]: {
"hitchhiker/puzzle42": {
createPermission: false
}
}