Skip to content

v1.12.13+hotfix.1 cherry-picks - #45962

Merged
tvolkert merged 2 commits into
flutter:v1.12.13-hotfixesfrom
tvolkert:v1.12.13-hotfixes
Dec 3, 2019
Merged

tvolkert merged 2 commits into
flutter:v1.12.13-hotfixesfrom
tvolkert:v1.12.13-hotfixes

Conversation

@tvolkert

@tvolkert tvolkert commented Dec 3, 2019

Copy link
Copy Markdown
Contributor

flutter-team-archive/engine@c1e322b Dart cherry-picks for 1.12.13
37f9c54 Use RenderSliverPadding to inset SliverFillViewport

@fluttergithubbot

Copy link
Copy Markdown
Contributor

This pull request was opened against a branch other than master. Since Flutter pull requests should not normally be opened against branches other than master, I have changed the base to master. If this was intended, you may modify the base back to v1.12.13-hotfixes. See the Release Process for information about how other branches get updated.

Reviewers: Use caution before merging pull requests to branches other than master. The circumstances where this is valid are very rare.

/cc @dnfield

@fluttergithubbot
fluttergithubbot changed the base branch from v1.12.13-hotfixes to master December 3, 2019 04:07
@fluttergithubbot fluttergithubbot added engine flutter/engine related. See also e: labels. framework flutter/packages/flutter repository. See also f: labels. labels Dec 3, 2019
@tvolkert
tvolkert changed the base branch from master to v1.12.13-hotfixes December 3, 2019 04:07
@tvolkert

tvolkert commented Dec 3, 2019

Copy link
Copy Markdown
Contributor Author

@athomas

@athomas

athomas commented Dec 3, 2019

Copy link
Copy Markdown
Contributor

LGTM

@tvolkert
tvolkert merged commit 5b07015 into flutter:v1.12.13-hotfixes Dec 3, 2019
@tvolkert
tvolkert deleted the v1.12.13-hotfixes branch December 3, 2019 08:12
A-yum3 added a commit to A-yum3/flutter that referenced this pull request Jan 15, 2020
* 'v1.12.13-hotfixes' of github.com:Javateaboy/flutter:
  v1.12.13+hotfix.6 cherry-picks (flutter#46741)
  v1.12.13+hotfix.5 cherry-picks (flutter#46726)
  v1.12.13+hotfix.4 cherry-picks (flutter#46632)
  v1.12.13+hotfix.3 cherry-picks (flutter#46204)
  v1.12.13+hotfix.2 cherry-picks (flutter#46055)
  v1.12.13+hotfix.1 cherry-picks (flutter#45962)

# Conflicts:
#	.cirrus.yml
#	bin/internal/engine.version
#	dev/devicelab/bin/tasks/build_ios_framework_module_test.dart
#	packages/flutter/lib/src/rendering/sliver_fill.dart
#	packages/flutter/lib/src/widgets/sliver.dart
#	packages/flutter/test/widgets/page_view_test.dart
#	packages/flutter_tools/gradle/flutter.gradle
#	packages/flutter_tools/lib/src/base/build.dart
#	packages/flutter_tools/lib/src/commands/build_ios_framework.dart
#	packages/flutter_tools/lib/src/commands/upgrade.dart
#	packages/flutter_tools/test/commands.shard/permeable/upgrade_test.dart
#	packages/flutter_tools/test/general.shard/base/build_test.dart
#	packages/flutter_tools/test/general.shard/features_test.dart
RaviKavaiya pushed a commit to RaviKavaiya/flutter that referenced this pull request Jan 17, 2020
flutter-team-archive/engine@c1e322b Dart cherry-picks for 1.12.13
37f9c54 Use RenderSliverPadding to inset SliverFillViewport
responilla07 pushed a commit to responilla07/flutter that referenced this pull request Jun 8, 2020
flutter-team-archive/engine@c1e322b Dart cherry-picks for 1.12.13
37f9c54 Use RenderSliverPadding to inset SliverFillViewport
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Aug 3, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

engine flutter/engine related. See also e: labels. framework flutter/packages/flutter repository. See also f: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants