Commit Graph

13 Commits

Author SHA1 Message Date
Ehud Adler
ee84943b52 Resign keyboard merge (#2071)
* Project icon

* Fixes #2057
2018-08-10 07:56:11 -04:00
Ryan Nystrom
f02831d654 more padding above merge unit (#1994) 2018-07-28 17:04:44 -04:00
Ryan Nystrom
5cf3a7c568 More granular messaging and controls for merge state (#1993)
* update schema

* more granular merge status messaging and controls

* handle unknown

* pending state
2018-07-28 17:04:08 -04:00
Ryan Nystrom
e56c29a9a6 Redesigned Issues interface (#1983)
* clean up title model

* update title style

* organize issue SC method

* remove background colors from styled text in issues

* collection view bg white

* remove card inset and clean up snap superview code

* clean up label design

* thread is root and change base font size

* remove borders on comment cells

* adjust collapse design

* adjust comment line spacing and make non-root body smaller

* refactor detail view

* viewer header background color

* more buttons in reaction cell

* vertical spacers working

* design basically finished;

* scroll to bottom accounts for inset

* PR review background color white

* fixup PR review comments

* spacing on merge and review

* readme background white

* rename to just "spacer"

* horizontal spacing

* fix tests
2018-07-27 11:03:09 -04:00
Ryan Nystrom
7a1758f82d add insets to issue with new button design (#1935) 2018-07-19 09:22:53 -04:00
Ryan Nystrom
50f602758b Open CI links (#1902) 2018-07-14 18:22:55 -04:00
Ryan Nystrom
ae26f96f76 Only display repo-allowed merge methods on PRs (#1817)
* update to latest GQL schema

* remove deprecated GQL

* add merge-allowed APIs

* wire up merge methods

* remove pref type if changed
2018-05-19 19:08:10 -04:00
Ryan Nystrom
dddea5db5b use word "change" 2018-04-15 11:07:52 -04:00
Ryan Nystrom
5c9b4acd6b Add title to merge toggle 2018-04-15 11:04:23 -04:00
Bas Broek
ddddb6363f Add merge status tests (#1604)
* Add merge status tests

* Introduce containsAll and containsNone

* Rename containsAll to containsOnly
2018-03-04 21:36:25 -05:00
Bas Broek
7c79f6a2af Add support for pending merges (#1533)
* Add pending state

* Add pending logic

* Assert on `.expected`

* Remove extraneous state check

* Pull out combined merge status logic
2018-02-20 19:27:32 -05:00
Ryan Nystrom
5c9112acc8 loading state and show merge error message (#1530) 2018-02-19 12:05:39 -05:00
Ryan Nystrom
0b9508493e [WIP] Merge PRs (#1511)
* display merge status

* refactor merge button and wire up interactivity

* wire up merge type selection

* merge working
2018-02-15 22:30:14 -05:00