development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-09-12 21:01:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bring these over from the conflict

Browse source
This commit is contained in:
joshaber 2016-12-05 11:42:59 -05:00
parent c12437b66c
commit dfa3a6654f
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/ui/lib/configure-git-user.tsx
View file

@ -3,6 +3,7 @@ import { Commit } from '../../models/commit'
import { getGlobalConfigValue, setGlobalConfigValue } from '../../lib/git/config'
import { CommitListItem } from '../history/commit-list-item'
import { User } from '../../models/user'
import { CommitIdentity } from '../../models/commit-identity'
interface IConfigureGitUserProps {
/** The logged-in users. */
@ -57,14 +58,18 @@ export class ConfigureGitUser extends React.Component<IConfigureGitUserProps, IC
public render() {
const now = new Date()
const dummyCommit1 = new Commit('', 'Do more things', '', 'Hubot', this.state.email, this.dateWithMinuteOffset(now, -2), [])
const dummyCommit3 = new Commit('', 'Add some things', '', 'Hubot', this.state.email, this.dateWithMinuteOffset(now, -60), [])
const dummyAuthor1 = new CommitIdentity('Hubot', this.state.email, this.dateWithMinuteOffset(now, -2))
const dummyCommit1 = new Commit('', 'Do more things', '', dummyAuthor1, [])
const dummyAuthor3 = new CommitIdentity('Hubot', this.state.email, this.dateWithMinuteOffset(now, -60))
const dummyCommit3 = new Commit('', 'Add some things', '', dummyAuthor3, [])
// NB: We're using the name as the commit SHA:
// 1. `Commit` is referentially transparent wrt the SHA. So in order to get
// it to update when we name changes, we need to change the SHA.
// 2. We don't display the SHA so the user won't ever know our secret.
const dummyCommit2 = new Commit(this.state.name, 'Fix all the things', '', this.state.name, this.state.email, this.dateWithMinuteOffset(now, -30), [])
const dummyAuthor2 = new CommitIdentity(this.state.name, this.state.email, this.dateWithMinuteOffset(now, -30))
const dummyCommit2 = new Commit(this.state.name, 'Fix all the things', '', dummyAuthor2, [])
const emoji = new Map()
return (
<div id='configure-git-user'>