github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "[5.x] Update Saved Objects view with new components." (#9597)

Browse source
This commit is contained in:
CJ Cenizal 2016-12-21 11:57:54 -08:00 • committed by GitHub
parent fb308ada4e
commit eb8866cea1
5 changed files with 0 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

83
backport--instructions.rej
View file

@ -1,83 +0,0 @@
Backport of PR #9535 to branch 5.x failed
https://github.com/elastic/kibana/pull/9535
- 1 patch failed to apply
- 16 patches were applied successfully
-------------------------------------
At this point, you need to manually resolve these conflicts on your machine and
push the changes back up to this upstream branch so the PR is updated with your
changes. The following instructions and scripts should help with that.
All of the provided scripts assume that the remote "upstream" is where the
backport branch exists and that your local branch has the exact same name as
the upstream branch.
First, check out this branch locally:
git fetch upstream jasper/backport/9535/5.x
git checkout jasper/backport/9535/5.x
Now, just follow one of these two paths:
1. GUIDED BACKPORT
You should do the guided backport if you want to apply the backported changes
while resolving the conflicts on each commit. For most cases, this is what you
want to do.
The following script will rebase the commits that need to be backported onto
a new temporary branch. Resolve any conflicts as you normally would during a
rebase. Do not remove these backport-*.rej files, and feel free to add
additional commits if that's necessary:
sh backport-guided-begin.rej
Once the conficts are resolved and the rebase is completed, the following
script will update the local backport branch with the changes, remove the
temporary branch that was created, remove the remnants of this backport commit
and squash the newly resolved commits (and any others you may have added) into
a single backport commit with the proper commit message:
sh backport-guided-finish.rej
At this point, you should be on the local backport branch, and it should be
exactly 1 commit ahead of the intended target. The commit message should be
very similar if not identical to the PR itself, and the changeset should
include all of the changes you intended to backport and none of these
backport-*.rej files.
Now just replace the contents of the pull request with your local changes:
git push -f upstream jasper/backport/9535/5.x
2. ALMOST COMPLETELY MANUAL
You should do this option if there are just so many conflicts that it's easier
to rebuild the entire changeset from scratch. You'll still work on the local
backport branch which should be up to date with the intended target.
Feel free to add as many commits as you'd like and don't worry about fancy
commit messages - we're just going to squash them down and replace the message
when you're finished.
Once the changes are committed on your local backport branch, the following
script will remove the remnants of this backport commit and squash the newly
created commits into a single backport commit with the proper commit message.
sh backport-wrangle-into-commit.rej
At this point, you should be on the local backport branch, and it should be
exactly 1 commit ahead of the intended target. The commit message should be
very similar if not identical to the PR itself, and the changeset should
include all of the changes you intended to backport and none of these
backport-*.rej files.
Now just replace the contents of the pull request with your local changes:
git push -f upstream jasper/backport/9535/5.x

39
backport-commit-message.rej
View file

@ -1,39 +0,0 @@
Update Saved Objects view with new components.
Backports PR #9535
**Commit 1:**
Componentize Saved Objects table.
* Original sha: b7c08acd46939f16b1bf836e7b9af939276085ff
* Authored by CJ Cenizal <cj@cenizal.com> on 2016-12-16T05:12:38Z
**Commit 2:**
Remove Edit button from Saved Objects table.
* Original sha: 09b7a08e732f110d91b767b150ddde0cba953358
* Authored by CJ Cenizal <cj@cenizal.com> on 2016-12-16T23:28:26Z
**Commit 3:**
Remove inline Buttons from Table. Add MicroButtons to serve the same purpose.
* Original sha: 0f32b83747db2c082f0069bd04ec1a66abaeedf6
* Authored by CJ Cenizal <cj@cenizal.com> on 2016-12-17T00:36:56Z
**Commit 4:**
Use fat arrow function instead of self var in _objects.js. Add 'areAllRowsChecked' controller method.
* Original sha: fd29dbb445b804894f2649209adde2552a1fe1e6
* Authored by CJ Cenizal <cj@cenizal.com> on 2016-12-20T17:04:07Z
**Commit 5:**
Create visual separation between tabs and table, and add a border.
* Original sha: 94ea28559c778ec704c5990ce5213c92e9597e65
* Authored by CJ Cenizal <cj@cenizal.com> on 2016-12-21T01:03:48Z
**Commit 6:**
Add TODO comments to migrate scope vars to the controller.
* Original sha: c2a164d18af5f87e3f7ab33d980a4dd6ed55dbda
* Authored by CJ Cenizal <cj@cenizal.com> on 2016-12-21T19:11:26Z

12
backport-guided-begin.rej
View file

@ -1,12 +0,0 @@
#!/bin/sh
REMOTE="upstream"
BRANCH="jasper/backport/9535/5.x"
WORKING_BRANCH="tmp/$BRANCH"
STARTING_SHA="b7c08acd46939f16b1bf836e7b9af939276085ff"
ENDING_SHA="c2a164d18af5f87e3f7ab33d980a4dd6ed55dbda"
git fetch $REMOTE
git checkout -b $WORKING_BRANCH $ENDING_SHA
git rebase $STARTING_SHA^ --onto $BRANCH

10
backport-guided-finish.rej
View file

@ -1,10 +0,0 @@
#!/bin/sh
BRANCH="jasper/backport/9535/5.x"
WORKING_BRANCH="tmp/$BRANCH"
git checkout $BRANCH
git reset --hard $WORKING_BRANCH
git branch -D $WORKING_BRANCH
sh backport-wrangle-into-commit.rej

12
backport-wrangle-into-commit.rej
View file

@ -1,12 +0,0 @@
#!/bin/sh
REMOTE="upstream"
BRANCH="jasper/backport/9535/5.x"
COMMIT_MSG=`cat backport-commit-message.rej`
git reset --soft $REMOTE/$BRANCH
git stash
git reset --hard HEAD^
git stash apply --index
git commit -m "$COMMIT_MSG" --no-verify