spuder / puppet-gitlab

A puppet module to install gitlab 7
Apache License 2.0
36 stars 44 forks source link

Backup scheduling #146

Closed djjudas21 closed 9 years ago

djjudas21 commented 9 years ago

Create a set of parameters which can be supplied to configure the date/time that the backup rake task runs (e.g. weekly rather than daily). If left undefined, the task still runs at the default of 2am daily.

spuder commented 9 years ago

Thanks for this pull request, could you swash the commits so that the code review will be easier?

For reference, this will fix issue #139

spuder commented 9 years ago

Could you also add a working example to tests/all_parameters_enabled

djjudas21 commented 9 years ago

Ah I didn't realise there was already an outstanding issue. I've not written tests before but hopefully it should be easy to base new tests on existing ones, and then I'll squash it down.

djjudas21 commented 9 years ago

Errr I'm not sure if I did the squash properly - not done one before. It looked OK from my end but it's still showing a bunch of commits when I push to Github. Do I need to cancel the PR and re-send it?

spuder commented 9 years ago

Looks like the commits are still separated. When you do a swash, you are effectivly rewriting history. That is ok, because this is on a feature branch.

http://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git https://ariejan.net/2011/07/05/git-squash-your-latests-commits-into-one/

djjudas21 commented 9 years ago

Yeah, that's exactly the instructions I followed. Maybe it didn't work because I already pushed?

djjudas21 commented 9 years ago

Nope, squash commits don't work properly where the branch has already been pushed and had a merge request. I dunno why it's not working for me, but I suggest you just accept the merge request as-is and squash the commits after merging if you think it is important.

djjudas21 commented 9 years ago

I made a new branch, cherry-picked my commits into it and squashed before pushing. See #151 for revised, squashed edition