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.

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

cmd/strelaypoolsrv: Show popup on row hover #4201

Closed

Conversation

AudriusButkevicius
Copy link
Member

Shows map popup as you hover on the table row

@AudriusButkevicius
Copy link
Member Author

@st-review merge

skip-check: authors

@st-review
Copy link

@AudriusButkevicius: Build status is pending. I'll wait until it goes green and then merge!

@st-review
Copy link

@AudriusButkevicius: Couldn't retrieve your user information - not merging.

@AudriusButkevicius
Copy link
Member Author

@st-review merge

skip-check: authors

@st-review
Copy link

@AudriusButkevicius: Couldn't retrieve your user information - not merging.

@AudriusButkevicius
Copy link
Member Author

@st-review merge

skip-check: authors

@st-review
Copy link

@AudriusButkevicius: Merge failed:

$ git fetch -f origin refs/pull/4201/head:pr-4201
$ git fetch -f origin master:orig/master
From github.com:syncthing/syncthing
   7a15fef..3395992  master     -> orig/master
$ git reset --hard
HEAD is now at 3395992 gui: Make icons and directory information in local device summary consistent with folders (fixes #4100)
$ git checkout master
Already on 'master'
Your branch is up-to-date with 'origin/master'.
$ git reset --hard orig/master
HEAD is now at 3395992 gui: Make icons and directory information in local device summary consistent with folders (fixes #4100)
$ git clean -fxd
$ git merge --squash --no-commit pr-4201
Updating 3395992..ad6f0ef
Fast-forward
Squash commit -- not updating HEAD
 cmd/strelaypoolsrv/gui/index.html | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
$ git commit -F -
Commit message subject:

    skip-check: authors

doesn't look like "tag: One sentence description". Specifically, it doesn't
match this pattern:

    ^[\w/,\. ]+: \w

@AudriusButkevicius
Copy link
Member Author

@st-review merge

skip-checks: authors

@st-review
Copy link

@AudriusButkevicius: Build status is failure -- refusing to merge.

@AudriusButkevicius
Copy link
Member Author

@st-review retest

@st-review
Copy link

I'm sorry, @AudriusButkevicius. I'm afraid I don't know what you mean. I know how to don't, lgtm, merge, prevent, squash, stop.

@AudriusButkevicius
Copy link
Member Author

@st-jenkins retest

@AudriusButkevicius
Copy link
Member Author

@st-jenkins test this please helooo?

@AudriusButkevicius
Copy link
Member Author

@st-review merge

@st-review
Copy link

@AudriusButkevicius: Build status is pending. I'll wait until it goes green and then merge!

@st-review
Copy link

@AudriusButkevicius: Build status is failure -- refusing to merge.

@AudriusButkevicius
Copy link
Member Author

this is the future, talking to robots on a wednesday evening.

@AudriusButkevicius
Copy link
Member Author

@st-review merge

@st-review
Copy link

👌 Merged as d637148. Thanks, @AudriusButkevicius!

@st-review st-review closed this Jun 7, 2017
st-review pushed a commit that referenced this pull request Jun 7, 2017
@AudriusButkevicius AudriusButkevicius deleted the poolsrv branch June 7, 2017 22:06
viable-hartman pushed a commit to viable-hartman/syncthing that referenced this pull request Aug 25, 2017
@st-review st-review added the pr-merged Legacy label used in the past for pull requests merged to the main tree label Jan 15, 2018
@st-review st-review added the frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion label Jul 15, 2018
@syncthing syncthing locked and limited conversation to collaborators Jul 15, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
frozen-due-to-age Issues closed and untouched for a long time, together with being locked for discussion pr-merged Legacy label used in the past for pull requests merged to the main tree
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants