Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support unregistered users on BitbucketServer #193

Merged
merged 2 commits into from
Feb 11, 2019
Merged

Support unregistered users on BitbucketServer #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ca9764
Support unregistered users on BitbucketServer
f-meloni Feb 11, 2019
6d7d61d
Updated CHANGELOG
f-meloni Feb 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@

## Master

- Reset markdowns on the resetDangerResults method [@f-meloni][] - [#192](https://github.com/danger/swift/pull/191)
- Support unregistered users on BitbucketServer [@f-meloni][] - [#193](https://github.com/danger/swift/pull/193)
- Reset markdowns on the resetDangerResults method [@f-meloni][] - [#192](https://github.com/danger/swift/pull/192)

## 1.3.1

Expand Down
10 changes: 5 additions & 5 deletions Sources/Danger/BitBucketServerDSL.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,23 +397,23 @@ public struct BitBucketServerProject: Decodable, Equatable {

public struct BitBucketServerUser: Decodable, Equatable {
/// The unique user ID
public let id: Int
public let id: Int?

/// The name of the user
public let name: String

/// The name to use when referencing the user
public let displayName: String
public let displayName: String?

/// The email for the user
public let emailAddress: String

/// Is the account active
public let active: Bool
public let active: Bool?

/// The user's slug for URLs
public let slug: String
public let slug: String?

/// The type of a user, "NORMAL" being a typical user3
public let type: String
public let type: String?
}
12 changes: 1 addition & 11 deletions Sources/DangerFixtures/DangerDSLResources/DangerDLSBitBucketServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,23 +259,13 @@ public let DSLBitBucketServerJSON = """
},
{
"author": {
"active": true,
"displayName": "DangerCI",
"emailAddress": "foo@bar.com",
"id": 2,
"name": "danger",
"slug": "danger",
"type": "NORMAL"
"name": "danger"
},
"authorTimestamp": 1518863882000,
"committer": {
"active": true,
"displayName": "DangerCI",
"emailAddress": "foo@bar.com",
"id": 2,
"name": "danger",
"slug": "danger",
"type": "NORMAL"
},
"committerTimestamp": 1518863882000,
"displayId": "c62ada76533",
Expand Down