search

FoodCircles / food_circles

application
http://joinfoodcircles.org
9 stars 14 forks source link

Work in branches please! - Broken commits should be reverted, too! #22

Closed sicarul closed 10 years ago

sicarul commented 10 years ago

This is what i see when i pull master, please if you don't know if it works don't commit, and if you detect a bug revert it from the repository, now i have to find the error in my machine to revert it :/

screenshot from 2014-02-14 00 37 26

sicarul commented 10 years ago

Also... please don't test in production, setup a proper test environment!

kumario commented 10 years ago

@sicarul, this is a mistake on my part in trying to deploy @taylorsatula's A/B test to the site. It worked locally so we weren't sure why things were messed up on prod. Secondly, I may have not reverted correctly, which comes from a lack of knowledge in this area. Sorry for making your work difficult...

Finally, setting up a proper test environment is actually next on your list. That, the "best users" table, and fixing Taylor's AB test would all count as fixes.

sicarul commented 10 years ago

Ok, the best users Table is done, i will contact Taylor to help him on the week then. To revert a commit you have to issue the git command:

git revert The commit hash is the funny letters-numbers sequence you see at github on the right of each commit (You have to click it to copy the complete hash). You can also see it with the command: git log

This outputs:

commit 25c3ffc4759dcd7cd9edec5ee536152115257719 Author: Taylor taylorsatula@gmail.com Date: Thu Feb 13 15:03:25 2014 -0500

A/B Testing CSS & HTML Patch

Added .gitignore for my Espresso project mgmt

Updated CSS file to keep the text in the center of the page.

[...]

So the commit there is 25c3ffc4759dcd7cd9edec5ee536152115257719, which i reverted with:

git revert 25c3ffc4759dcd7cd9edec5ee536152115257719

Have a nice weekend!

Pablo Seibelt

On Sat, Feb 15, 2014 at 3:06 AM, kumario notifications@github.com wrote:

@sicarul https://github.com/sicarul, this is a mistake on my part in trying to deploy @taylorsatula https://github.com/taylorsatula's A/B test to the site. It worked locally so we weren't sure why things were messed up on prod. Secondly, I may have not reverted correctly, which comes from a lack of knowledge in this area. Sorry for making your work difficult...

Finally, setting up a proper test environment is actually next on your list. That, the "best users" table, and fixing Taylor's AB test would all count as fixes.

Reply to this email directly or view it on GitHubhttps://github.com/FoodCircles/food_circles/issues/22#issuecomment-35148509 .

kumario commented 10 years ago

@sicarul,

It is strange, I have reverted many times before. Last time, it looked like I successfully reverted, but apparently it was not the case.

Jonathans-MacBook-Pro:food_circles koomboy$ git revert 25c3ffc4759dcd7cd9edec5ee536152115257719 [master 1efd274] Revert "A/B Testing CSS & HTML Patch" 7 files changed, 26 insertions(+), 199 deletions(-) rewrite app/views/layouts/_mix-panel.html.erb (65%) delete mode 100755 public/javascripts/scenario-testing.js Jonathans-MacBook-Pro:food_circles koomboy$ ssh tkxel_dev@50.116.57.152 tkxel_dev@50.116.57.152's password: Last login: Thu Feb 13 15:11:21 2014 from c-68-84-174-24.hsd1.mi.comcast.net tkxel_dev@foodcircles:~$ update_staging From github.com:FoodCircles/food_circles

I'm sorry it didn't work. :\ How can I access your "Best Users" work? Did you commit?

sicarul commented 10 years ago

You can access the admin panel and there you have a new option called "Achievements" next to dashboard and logout.

There i see clearly you have missed the git push, i think that's why you didn't see the revert on the server

Anyway, i already sent the revert as i had to do it to even test my work

Thanks! Bye

Pablo Seibelt

On Mon, Feb 17, 2014 at 11:11 PM, kumario notifications@github.com wrote:

@sicarul https://github.com/sicarul,

It is strange, I have reverted many times before. Last time, it looked like I successfully reverted, but apparently it was not the case.

Jonathans-MacBook-Pro:food_circles koomboy$ git revert 25c3ffchttps://github.com/FoodCircles/food_circles/commit/25c3ffc4759dcd7cd9edec5ee536152115257719 [master 1efd274] Revert "A/B Testing CSS & HTML Patch" 7 files changed, 26 insertions(+), 199 deletions(-) rewrite app/views/layouts/

_mix-panel.html.erb (65%) delete mode 100755 public/javascripts/scenario-testing.js Jonathans-MacBook-Pro:food_circles koomboy$ ssh tkxel_dev@50.116.57.152 tkxel_dev@50.116.57.152's password: Last login: Thu Feb 13 15:11:21 2014 from c-68-84-174-24.hsd1.mi.comcast.net tkxel_dev@foodcircles:~$ update_staging From github.com:FoodCircles/food_circles

  • branch master -> FETCH_HEAD Already up-to-date. /home/tkxel_dev/.rvm/rubies/ruby-1.9.3-p429/bin/ruby /home/tkxel_dev/.rvm/gems/ruby-1.9.3-p429@food_circles/bin/rake assets:precompile:all RAILS_ENV=staging RAILS_GROUPS=assets /home/tkxel_dev/.rvm/gems/ruby-1.9.3-p429@global/gems/bundler-1.3.5/lib/bundler/runtime.rb:216: warning: Insecure world writable dir /home/tkxel_dev in PATH, mode 040777 /home/tkxel_dev/.rvm/gems/ruby-1.9.3-p429@global/gems/bundler-1.3.5/lib/bundler/runtime.rb:216: warning: Insecure world writable dir /home/tkxel_dev in PATH, mode 040777 [sudo] password for tkxel_dev:
  • Restarting web server apache2 ... waiting [ OK ] tkxel_dev@foodcircles:~/staging/staging$ git revert 25c3ffchttps://github.com/FoodCircles/food_circles/commit/25c3ffc4759dcd7cd9edec5ee536152115257719[master da82a4d] Revert "A/B Testing CSS & HTML Patch" 7 files changed, 26 insertions(+), 199 deletions(-) rewrite app/views/layouts/mix-panel.html.erb (65%) delete mode 100755 public/javascripts/scenario-testing.js tkxel dev@foodcircles:~/staging/staging$ exit logout

I'm sorry it didn't work. :\ How can I access your "Best Users" work? Did you commit?

Reply to this email directly or view it on GitHubhttps://github.com/FoodCircles/food_circles/issues/22#issuecomment-35343677 .

sicarul commented 10 years ago

It seems my commit was deleted, i will send it again.

Pablo Seibelt

On Tue, Feb 18, 2014 at 12:38 AM, Pablo Seibelt pabloseibelt@gmail.comwrote:

You can access the admin panel and there you have a new option called "Achievements" next to dashboard and logout.

There i see clearly you have missed the git push, i think that's why you didn't see the revert on the server

Anyway, i already sent the revert as i had to do it to even test my work

Thanks! Bye

Pablo Seibelt

On Mon, Feb 17, 2014 at 11:11 PM, kumario notifications@github.comwrote:

@sicarul https://github.com/sicarul,

It is strange, I have reverted many times before. Last time, it looked like I successfully reverted, but apparently it was not the case.

Jonathans-MacBook-Pro:food_circles koomboy$ git revert 25c3ffchttps://github.com/FoodCircles/food_circles/commit/25c3ffc4759dcd7cd9edec5ee536152115257719 [master 1efd274] Revert "A/B Testing CSS & HTML Patch" 7 files changed, 26 insertions(+), 199 deletions(-) rewrite app/views/layouts/

_mix-panel.html.erb (65%) delete mode 100755 public/javascripts/scenario-testing.js Jonathans-MacBook-Pro:food_circles koomboy$ ssh tkxel_dev@50.116.57.152 tkxel_dev@50.116.57.152's password: Last login: Thu Feb 13 15:11:21 2014 from c-68-84-174-24.hsd1.mi.comcast.net tkxel_dev@foodcircles:~$ update_staging From github.com:FoodCircles/food_circles

  • branch master -> FETCH_HEAD Already up-to-date. /home/tkxel_dev/.rvm/rubies/ruby-1.9.3-p429/bin/ruby /home/tkxel_dev/.rvm/gems/ruby-1.9.3-p429@food_circles/bin/rake assets:precompile:all RAILS_ENV=staging RAILS_GROUPS=assets /home/tkxel_dev/.rvm/gems/ruby-1.9.3-p429@global/gems/bundler-1.3.5/lib/bundler/runtime.rb:216: warning: Insecure world writable dir /home/tkxel_dev in PATH, mode 040777 /home/tkxel_dev/.rvm/gems/ruby-1.9.3-p429@global/gems/bundler-1.3.5/lib/bundler/runtime.rb:216: warning: Insecure world writable dir /home/tkxel_dev in PATH, mode 040777 [sudo] password for tkxel_dev:
  • Restarting web server apache2 ... waiting [ OK ] tkxel_dev@foodcircles:~/staging/staging$ git revert 25c3ffchttps://github.com/FoodCircles/food_circles/commit/25c3ffc4759dcd7cd9edec5ee536152115257719[master da82a4d] Revert "A/B Testing CSS & HTML Patch" 7 files changed, 26 insertions(+), 199 deletions(-) rewrite app/views/layouts/mix-panel.html.erb (65%) delete mode 100755 public/javascripts/scenario-testing.js tkxel dev@foodcircles:~/staging/staging$ exit logout

I'm sorry it didn't work. :\ How can I access your "Best Users" work? Did you commit?

Reply to this email directly or view it on GitHubhttps://github.com/FoodCircles/food_circles/issues/22#issuecomment-35343677 .

kumario commented 10 years ago

I apologize Pablo. You can see you are REALLY helping us here at FoodCircles. :P

Jonathan Kumar joinfoodcircles.org (Watch our explainer video https://vimeo.com/78364883) (w) 616 61F OOD6

http://www.facebook.com/foodcircles http://www.twitter.com/foodcircles [image: https://play.google.com/store/apps/details?id=co.foodcircles]https://play.google.com/store/apps/details?id=co.foodcircles [image: https://itunes.apple.com/us/app/foodcircles-for-iphone/id710592600] https://itunes.apple.com/us/app/foodcircles-for-iphone/id710592600

"I am the vine, you are the branches."http://www.biblegateway.com/passage/?search=John%2015:5&version=NIV

On Mon, Feb 17, 2014 at 10:40 PM, sicarul notifications@github.com wrote:

It seems my commit was deleted, i will send it again.

Pablo Seibelt

On Tue, Feb 18, 2014 at 12:38 AM, Pablo Seibelt <pabloseibelt@gmail.com

wrote:

You can access the admin panel and there you have a new option called "Achievements" next to dashboard and logout.

There i see clearly you have missed the git push, i think that's why you didn't see the revert on the server

Anyway, i already sent the revert as i had to do it to even test my work

Thanks! Bye

Pablo Seibelt

On Mon, Feb 17, 2014 at 11:11 PM, kumario <notifications@github.com wrote:

@sicarul https://github.com/sicarul,

It is strange, I have reverted many times before. Last time, it looked like I successfully reverted, but apparently it was not the case.

Jonathans-MacBook-Pro:food_circles koomboy$ git revert 25c3ffc< https://github.com/FoodCircles/food_circles/commit/25c3ffc4759dcd7cd9edec5ee536152115257719

[master 1efd274] Revert "A/B Testing CSS & HTML Patch" 7 files changed, 26 insertions(+), 199 deletions(-) rewrite app/views/layouts/

_mix-panel.html.erb (65%) delete mode 100755 public/javascripts/scenario-testing.js Jonathans-MacBook-Pro:food_circles koomboy$ ssh tkxel_dev@50.116.57.152 tkxel_dev@50.116.57.152's password: Last login: Thu Feb 13 15:11:21 2014 from c-68-84-174-24.hsd1.mi.comcast.net tkxel_dev@foodcircles:~$ update_staging From github.com:FoodCircles/food_circles

  • branch master -> FETCH_HEAD Already up-to-date. /home/tkxel_dev/.rvm/rubies/ruby-1.9.3-p429/bin/ruby /home/tkxel_dev/.rvm/gems/ruby-1.9.3-p429@food_circles/bin/rake assets:precompile:all RAILS_ENV=staging RAILS_GROUPS=assets /home/tkxel_dev/.rvm/gems/ruby-1.9.3-p429@global /gems/bundler-1.3.5/lib/bundler/runtime.rb:216: warning: Insecure world writable dir /home/tkxel_dev in PATH, mode 040777 /home/tkxel_dev/.rvm/gems/ruby-1.9.3-p429@global /gems/bundler-1.3.5/lib/bundler/runtime.rb:216: warning: Insecure world writable dir /home/tkxel_dev in PATH, mode 040777 [sudo] password for tkxel_dev:
  • Restarting web server apache2 ... waiting [ OK ] tkxel_dev@foodcircles:~/staging/staging$ git revert 25c3ffc< https://github.com/FoodCircles/food_circles/commit/25c3ffc4759dcd7cd9edec5ee536152115257719>[master da82a4d] Revert "A/B Testing CSS & HTML Patch" 7 files changed, 26 insertions(+), 199 deletions(-) rewrite app/views/layouts/mix-panel.html.erb (65%) delete mode 100755 public/javascripts/scenario-testing.js tkxel dev@foodcircles:~/staging/staging$ exit logout

I'm sorry it didn't work. :\ How can I access your "Best Users" work? Did you commit?

Reply to this email directly or view it on GitHub< https://github.com/FoodCircles/food_circles/issues/22#issuecomment-35343677

.

Reply to this email directly or view it on GitHubhttps://github.com/FoodCircles/food_circles/issues/22#issuecomment-35349770 .

kumario commented 10 years ago

I reverted on the server then hit "update_staging" which is a command a previous volunteer had set to git pull and do some other things.

He said "That should handle everything needed. If you want to see what that command is doing you can open up ~/.bash_profile on the server using vim or nano and it's in there. "

Jonathan Kumar joinfoodcircles.org (Watch our explainer video https://vimeo.com/78364883) (w) 616 61F OOD6

http://www.facebook.com/foodcircles http://www.twitter.com/foodcircles [image: https://play.google.com/store/apps/details?id=co.foodcircles]https://play.google.com/store/apps/details?id=co.foodcircles [image: https://itunes.apple.com/us/app/foodcircles-for-iphone/id710592600] https://itunes.apple.com/us/app/foodcircles-for-iphone/id710592600

"I am the vine, you are the branches."http://www.biblegateway.com/passage/?search=John%2015:5&version=NIV

On Mon, Feb 17, 2014 at 11:32 PM, Jonathan Kumar jk@joinfoodcircles.orgwrote:

I apologize Pablo. You can see you are REALLY helping us here at FoodCircles. :P

Jonathan Kumar joinfoodcircles.org (Watch our explainer video https://vimeo.com/78364883) (w) 616 61F OOD6

http://www.facebook.com/foodcircles http://www.twitter.com/foodcircles [image: https://play.google.com/store/apps/details?id=co.foodcircles]https://play.google.com/store/apps/details?id=co.foodcircles [image: https://itunes.apple.com/us/app/foodcircles-for-iphone/id710592600] https://itunes.apple.com/us/app/foodcircles-for-iphone/id710592600

"I am the vine, you are the branches."http://www.biblegateway.com/passage/?search=John%2015:5&version=NIV

On Mon, Feb 17, 2014 at 10:40 PM, sicarul notifications@github.comwrote:

It seems my commit was deleted, i will send it again.

Pablo Seibelt

On Tue, Feb 18, 2014 at 12:38 AM, Pablo Seibelt <pabloseibelt@gmail.com

wrote:

You can access the admin panel and there you have a new option called "Achievements" next to dashboard and logout.

There i see clearly you have missed the git push, i think that's why you didn't see the revert on the server

Anyway, i already sent the revert as i had to do it to even test my work

Thanks! Bye

Pablo Seibelt

On Mon, Feb 17, 2014 at 11:11 PM, kumario <notifications@github.com wrote:

@sicarul https://github.com/sicarul,

It is strange, I have reverted many times before. Last time, it looked like I successfully reverted, but apparently it was not the case.

Jonathans-MacBook-Pro:food_circles koomboy$ git revert 25c3ffc< https://github.com/FoodCircles/food_circles/commit/25c3ffc4759dcd7cd9edec5ee536152115257719

[master 1efd274] Revert "A/B Testing CSS & HTML Patch" 7 files changed, 26 insertions(+), 199 deletions(-) rewrite app/views/layouts/

_mix-panel.html.erb (65%) delete mode 100755 public/javascripts/scenario-testing.js Jonathans-MacBook-Pro:food_circles koomboy$ ssh tkxel_dev@50.116.57.152 tkxel_dev@50.116.57.152's password: Last login: Thu Feb 13 15:11:21 2014 from c-68-84-174-24.hsd1.mi.comcast.net tkxel_dev@foodcircles:~$ update_staging From github.com:FoodCircles/food_circles

  • branch master -> FETCH_HEAD Already up-to-date. /home/tkxel_dev/.rvm/rubies/ruby-1.9.3-p429/bin/ruby /home/tkxel_dev/.rvm/gems/ruby-1.9.3-p429@food_circles/bin/rake assets:precompile:all RAILS_ENV=staging RAILS_GROUPS=assets /home/tkxel_dev/.rvm/gems/ruby-1.9.3-p429@global /gems/bundler-1.3.5/lib/bundler/runtime.rb:216: warning: Insecure world writable dir /home/tkxel_dev in PATH, mode 040777 /home/tkxel_dev/.rvm/gems/ruby-1.9.3-p429@global /gems/bundler-1.3.5/lib/bundler/runtime.rb:216: warning: Insecure world writable dir /home/tkxel_dev in PATH, mode 040777 [sudo] password for tkxel_dev:
  • Restarting web server apache2 ... waiting [ OK ] tkxel_dev@foodcircles:~/staging/staging$ git revert 25c3ffc< https://github.com/FoodCircles/food_circles/commit/25c3ffc4759dcd7cd9edec5ee536152115257719>[master da82a4d] Revert "A/B Testing CSS & HTML Patch" 7 files changed, 26 insertions(+), 199 deletions(-) rewrite app/views/layouts/mix-panel.html.erb (65%) delete mode 100755 public/javascripts/scenario-testing.js tkxel dev@foodcircles:~/staging/staging$ exit logout

I'm sorry it didn't work. :\ How can I access your "Best Users" work? Did you commit?

Reply to this email directly or view it on GitHub< https://github.com/FoodCircles/food_circles/issues/22#issuecomment-35343677

.

Reply to this email directly or view it on GitHubhttps://github.com/FoodCircles/food_circles/issues/22#issuecomment-35349770 .

taylorsatula commented 10 years ago

Hey, just popping in here before bed.

@sicarul Pablo, I'm just going to admit that I need your help with some of this stuff. Between the HAML, server side non-updates, and such I need some help. Tomorrow morning when I get to work I'll fill you in more but yeah. I'm learning HAML and SCSS and stuff as fast as I can but in the mean time to be honest I'm kind of lost. This markdown business is new and unexpected to me. If you would help me out with the issue of the javascript blanking on-page scroller tomorrow I would be absurdly grateful.

Anyway, I'll talk to you in the morning, also talk to you Jon. Goodnight guys, as you were.

kumario commented 10 years ago

Thanks @taylorsatula. Let's see what we can do to ask @sicarul the most specific inquiries we can in the morning.

Good evening!

sicarul commented 10 years ago

I'm online on Skype since 7pm ART (GMT -3), on weekdays, will you be available at that time Taylor?

Pablo Seibelt

On Tue, Feb 18, 2014 at 1:51 AM, kumario notifications@github.com wrote:

Thanks @taylorsatula https://github.com/taylorsatula. Let's see what we can do to ask @sicarul https://github.com/sicarul the most specific inquiries we can in the morning.

Good evening!

Reply to this email directly or view it on GitHubhttps://github.com/FoodCircles/food_circles/issues/22#issuecomment-35352451 .

taylorsatula commented 10 years ago

I can be available whenever you are. Today or tomorrow work for you?

sicarul commented 10 years ago

Today is alright! Lets talk later today then, i already have your skype El feb 18, 2014 11:09 a.m., "Taylor Satula" notifications@github.com escribió:

I can be available whenever you are. Today or tomorrow work for you?

Reply to this email directly or view it on GitHubhttps://github.com/FoodCircles/food_circles/issues/22#issuecomment-35386976 .

sicarul commented 10 years ago

I think we can close this issue now