Skip to content

Add "behind" mergeable state. #86

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

Merged
iphydf merged 1 commit into from
Feb 19, 2018
Merged

Add "behind" mergeable state. #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ language: generic
script:
- rm -f $HOME/.cabal && ln -s $HOME/.cabal-tools $HOME/.cabal
- rm -f $HOME/.ghc && ln -s $HOME/.ghc-tools $HOME/.ghc
- cabal install hpc-coveralls stylish-haskell hlint aeson-0.9.0.1
- cabal install hpc-coveralls stylish-haskell hlint yaml-0.8.27 aeson-0.9.0.1
- curl https://raw.githubusercontent.com/TokTok/toktok-stack/master/tools/stylish-haskell-lhs
-o $HOME/.cabal/bin/stylish-haskell-lhs
- chmod +x $HOME/.cabal/bin/stylish-haskell-lhs
Expand Down
10 changes: 5 additions & 5 deletions github-tools.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ library
, containers
, cryptohash
, exceptions
, github >= 0.16.0
, github >= 0.19
, groom
, html
, http-client >= 0.4.30
Expand All @@ -130,7 +130,7 @@ executable hub-pulls
build-depends:
base >= 4 && < 5
, bytestring
, github >= 0.16.0
, github >= 0.19
, github-tools
, text
hs-source-dirs: tools
Expand All @@ -143,7 +143,7 @@ executable hub-changelog
build-depends:
base >= 4 && < 5
, bytestring
, github >= 0.16.0
, github >= 0.19
, github-tools
, text
hs-source-dirs: tools
Expand All @@ -156,7 +156,7 @@ executable hub-roadmap
build-depends:
base >= 4 && < 5
, bytestring
, github >= 0.16.0
, github >= 0.19
, github-tools
, text
hs-source-dirs: tools
Expand All @@ -173,7 +173,7 @@ executable webservice
, bytestring
, case-insensitive
, expiring-cache-map
, github >= 0.16.0
, github >= 0.19
, http-media
, http-types
, mtl
Expand Down
1 change: 1 addition & 0 deletions src/PullStatus.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ makePullRequestInfo repoName (reviewers, pr) = PullRequestInfo
where
(user, branch) = Text.breakOn ":" . GitHub.pullRequestCommitLabel . GitHub.pullRequestHead $ pr

showMergeableState GitHub.StateBehind = "behind"
showMergeableState GitHub.StateBlocked = "blocked"
showMergeableState GitHub.StateClean = "clean"
showMergeableState GitHub.StateDirty = "dirty"
Expand Down
2 changes: 1 addition & 1 deletion templates/haskell.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ script:
# incompatible dependencies.
- rm -f $HOME/.cabal && ln -s $HOME/.cabal-tools $HOME/.cabal
- rm -f $HOME/.ghc && ln -s $HOME/.ghc-tools $HOME/.ghc
- cabal install hpc-coveralls stylish-haskell hlint aeson-0.9.0.1 %haskell.tools%
- cabal install hpc-coveralls stylish-haskell hlint yaml-0.8.27 aeson-0.9.0.1 %haskell.tools%
- curl https://raw.githubusercontent.com/TokTok/toktok-stack/master/tools/stylish-haskell-lhs -o $HOME/.cabal/bin/stylish-haskell-lhs
- chmod +x $HOME/.cabal/bin/stylish-haskell-lhs
# Do the style checks.
Expand Down