This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# put this in your .bash_profile | |
pull_request() { | |
to_branch=$1 | |
if [ -z $to_branch ]; then | |
to_branch="master" | |
fi | |
# try the upstream branch if possible, otherwise origin will do | |
upstream=$(git config --get remote.upstream.url) | |
origin=$(git config --get remote.origin.url) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# The webpack must compile assets before assets:environment task. | |
# Otherwise Sprockets sees no changes and don't precompile assets. | |
Rake::Task['assets:precompile'] | |
.clear_prerequisites | |
.enhance(['assets:compile_environment']) | |
Rake::Task['assets:clobber'].enhance do | |
Rake::Task['assets:clobber_webpack'].invoke | |
end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/.gitignore b/.gitignore | |
index 050c9d9..3292569 100644 | |
--- a/.gitignore | |
+++ b/.gitignore | |
@@ -15,3 +15,6 @@ | |
/log/* | |
!/log/.keep | |
/tmp | |
+ | |
+# Ignore node modules |