Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Rebase previous commits #2966

Merged
merged 2 commits into from
Aug 26, 2020
Merged

Rebase previous commits #2966

merged 2 commits into from
Aug 26, 2020

Conversation

jiahaog
Copy link
Member

@jiahaog jiahaog commented Aug 26, 2020

6eda8db accidentally removed some commits on head, so relanding them here:

@jiahaog
Copy link
Member Author

jiahaog commented Aug 26, 2020

Should I cherry pick these commits on top of master instead to preserve history? I think this repo is set up to only allow squash and merge

@jiahaog jiahaog requested a review from dnfield August 26, 2020 08:58
@dnfield
Copy link
Contributor

dnfield commented Aug 26, 2020

This already landed right? No we shouldn't rewrite history on this repo

@jiahaog
Copy link
Member Author

jiahaog commented Aug 26, 2020

No, this hasn't landed yet. I meant that either the two commits should be cherry picked onto master individually, or this PR should be merged (which squashes them together)

@dnfield
Copy link
Contributor

dnfield commented Aug 26, 2020

Ahhhh this was my fault. Argh. Sorry about that

Copy link
Contributor

@dnfield dnfield left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

I mistakenly pushed to master last night instead of to my fork.

@dnfield dnfield merged commit f8f666f into flutter:master Aug 26, 2020
@jiahaog
Copy link
Member Author

jiahaog commented Aug 26, 2020

No worries :)

KevinTheGray added a commit to KevinTheGray/plugins that referenced this pull request Aug 31, 2020
* master:
  [url_launcher, url_launcher_web]Added webOnlyWindowName parameter to launch()  (flutter#2979)
  [battery_platform_interface] Introduce package. (flutter#2975)
  [url_launcher_platform_interface] Add webOnlyWindowName parameter to launch() (flutter#2974)
  [share] Add sharing file support (android & ios) (flutter#970)
  [integration_test] add support to get timeline (flutter#2947)
  [battery] Moved battery to its own subdir (flutter#2969)
  [integration_test] Fix channel name for iOS, docs (flutter#2972)
  [integration_test] Show stack trace of widget test errors on the platform side (flutter#2967)
  [video_player] Fix `setWithOthers` test (flutter#2970)
  [video_player_platform_interface] fix `setMixIWithOthers` test channel (flutter#2968)
  Add README instructions for enablePendingPurchases (flutter#2921)
  Rebase previous commits (flutter#2966)
  Avoid walleye 26
  Updating documentation to use isEmpty check. (flutter#2955)
  [integration_test] Minor cleanup (flutter#2956)
  [path_provider, video_player] Tweak pubspecs to pass bulk analysis. (flutter#2959)
  [android_intent] fix platform package dep (flutter#2948)
  [shared_preferences_linux] update `file` package dep version to be compatible with framework (flutter#2950)
jorgefspereira pushed a commit to jorgefspereira/plugins_flutter that referenced this pull request Oct 10, 2020
* [battery] Fixed typo in README.md (flutter#2944)

* [integration_test] Remove debugging statement (flutter#2963)

Co-authored-by: Yash Johri <yashjohri1200@gmail.com>
FlutterSu pushed a commit to FlutterSu/flutter-plugins that referenced this pull request Nov 20, 2020
* [battery] Fixed typo in README.md (flutter#2944)

* [integration_test] Remove debugging statement (flutter#2963)

Co-authored-by: Yash Johri <yashjohri1200@gmail.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants