Details
-
Task
-
Resolution: Done
-
High
-
1.5.1
-
None
Description
[demo]/vcs/git/github/platformsh/platformsh-example-ezplatform$ git rebase ezdemo/1.5 rvm:ruby-2.3-head
First, rewinding head to replay your work on top of it...
Applying: [platform.sh] Add initial platform.sh files (awaiting testing)
Applying: [platform.sh] Rename files, full .yaml suffix needed
Applying: [platform.sh] Change endpoint name to be more standard
Applying: [platform.sh] Remove the ssi entry in routes.yaml, as it's unnecessary
Applying: [platform.sh] Use Composer build flavor, as Symfony is just an alias to it
Applying: [platform.sh] Use PHP 7.0 now that it's available
Applying: [platform.sh] Switch to new-style web location configuration
Applying: [platform.sh] Remove file whitelist, as it shouldn't be necessary
Applying: Run the CLI installer, but only if it hasn't been run (#27)
Applying: [Platform.sh] Add Redis, mariadb 10.0 & readline php ext (#29)
Applying: Standardize on app as the application name. (#32)
Applying: Fix syntax error in parameters_platform.php (#33)
Applying: Rename parameters_platform.php to env/platformsh.php
Applying: fixup: revert mode changes on .keep files
Applying: fixup: Use existing redis cache pool config now that we can specify redis port number
Applying: Upodate routing.yaml file for new app name.
Applying: Remove check for branch name for installer. (#1)
Applying: Fix EZP-26298 / Request #11118: Sporadic 500 Errors on Platform.sh (#2)
Applying: Revert "Fix EZP-26298 / Request #11118: Sporadic 500 Errors on Platform.sh (#2)" (#3)
[demo]/vcs/git/github/platformsh/platformsh-example-ezplatform$ git push rvm:ruby-2.3-head
To git@github.com:platformsh/platformsh-example-ezplatform.git
! [rejected] demo -> demo (non-fast-forward)
error: failed to push some refs to 'git@github.com:platformsh/platformsh-example-ezplatform.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Attachments
Issue Links
- mentioned in
-
Page Loading...