Commits · 0.6.0 · Tony Bionda / marge-bot

Browse files

Mar 06, 2018
- Bump to 0.6.0 and update changelog · 6d30194f
  Daniel Gorin authored Mar 03, 2018
  
  View commits for tag 0.6.0 0.6.0
  
  6d30194f
- Add --aproval-reset-timeout option to README file · 2561c41c
  Daniel Gorin authored Mar 03, 2018
  
  2561c41c
- Don't assume master exists when removing local branches · 7f24fa12
  Daniel Gorin authored Mar 03, 2018
  7f24fa12
Mar 03, 2018
- Fail to merge if changes already exist in target · 9986daf2
  Jaime Lennox authored Mar 01, 2018 and Daniel Gorín committed Mar 03, 2018
  9986daf2
Mar 01, 2018
- Add option to wait for approvals to reset after pushing · bbbfa38e
  Ben Brown authored Feb 21, 2018
  bbbfa38e
- Remove now irrelevant comment · 4c0ba01e
  Ben Brown authored Feb 21, 2018
  
  4c0ba01e
Feb 28, 2018
- Fix Python 3 encoding issue on Windows · de7a5ff8
  Oleksandr Redko authored Feb 27, 2018
  de7a5ff8
Feb 12, 2018
- Disable pylint in marge/job.py temporary · e8b776d3
  Marian Rusu authored Feb 09, 2018 and Daniel Gorín committed Feb 12, 2018
  e8b776d3
- Refactor Bot._run · 829a7b4e
  Marian Rusu authored Feb 06, 2018 and Daniel Gorín committed Feb 12, 2018
  829a7b4e
- fix test · d17793fd
  Marian Rusu authored Feb 09, 2018 and Daniel Gorín committed Feb 12, 2018
  d17793fd
- Enable full pylint checks and fix the code · 00d3ee2c
  Marian Rusu authored Feb 09, 2018 and Daniel Gorín committed Feb 12, 2018
  00d3ee2c
- Add flake8 test and make it pass · 94ef2e57
  Marian Rusu authored Feb 07, 2018 and Daniel Gorín committed Feb 12, 2018
  94ef2e57
- remove yapf config · e170916b
  Marian Rusu authored Feb 07, 2018 and Daniel Gorín committed Feb 12, 2018
  e170916b
Feb 09, 2018
- Handle the new 'locked' merge request state · a80ad6de
  Daniel Gorin authored Feb 08, 2018 and Marian Rusu committed Feb 09, 2018
  a80ad6de
Feb 08, 2018
- Prune stale branches when fetching from remote · 64a15823
  Ben Brown authored Feb 02, 2018 and Daniel Gorín committed Feb 08, 2018
  64a15823
Feb 02, 2018
- Add --use-merge-strategy to README.md · 600eaf33
  Daniel Gorin authored Feb 02, 2018
  
  600eaf33
- Mark --use-merge-strategy as experimental · b5d5a86a
  Daniel Gorin authored Feb 02, 2018
  b5d5a86a
- Wording · 1e6029f2
  Matthias Devlamynck authored Jan 29, 2018 and Daniel Gorín committed Feb 02, 2018
  
  1e6029f2
- Refactor merge implementation to reduce code duplication · 771d66e6
  Matthias Devlamynck authored Jan 23, 2018 and Daniel Gorín committed Feb 02, 2018
  
  771d66e6
- Update missed wording · eaf493da
  Matthias Devlamynck authored Dec 18, 2017 and Daniel Gorín committed Feb 02, 2018
  
  eaf493da
- Rename --merge to --use-merge-strategy, make it mutualy exclusive with... · 21076f5a
  Matthias Devlamynck authored Dec 15, 2017 and Daniel Gorín committed Feb 02, 2018
  21076f5a
- Separate the merge and rebase code paths, will deduplicate later · bcc856df
  Matthias Devlamynck authored Dec 14, 2017 and Daniel Gorín committed Feb 02, 2018
  
  bcc856df
- Add the --merge option · b101c8d9
  Matthias Devlamynck authored Dec 14, 2017 and Daniel Gorín committed Feb 02, 2018
  
  b101c8d9
Jan 26, 2018
- Bump to version 0.5.1 · c94624ff
  Marian Rusu authored Jan 26, 2018
  View commits for tag 0.5.1 0.5.1
  
  c94624ff
- Sleep even less between polling for MRs · 420aa417
  Alexander Schmolck authored Jan 10, 2018 and Marian Rusu committed Jan 26, 2018
  420aa417
Dec 05, 2017
- Use good old test instead of [[ · d5e588ce
  Daniel Gorin authored Dec 04, 2017
  View commits for tag 0.5.0 0.5.0
  
  d5e588ce
- Bump to version 0.5.0 · 8b897737
  Marian Rusu authored Dec 04, 2017 and Daniel Gorín committed Dec 05, 2017
  8b897737
- Add config file -> env var -> args configuration options · 3bcc11cc
  Marian Rusu authored Dec 04, 2017 and Daniel Gorín committed Dec 05, 2017
  3bcc11cc
Dec 04, 2017
- Bump to version 0.4.1 · a1b1b9ee
  Daniel Gorin authored Dec 04, 2017
  
  a1b1b9ee
- Fix trailfilter's error handling and its tests · 7e5b6d3b
  Daniel Gorin authored Dec 04, 2017 and Daniel Gorín committed Dec 04, 2017
  7e5b6d3b
- travis: use nix lang & automate dockerhub releases · 974c46fa
  Marian Rusu authored Nov 30, 2017 and Daniel Gorín committed Dec 04, 2017
  974c46fa
- Makefile: fix target name · 11336551
  Marian Rusu authored Nov 30, 2017 and Daniel Gorín committed Dec 04, 2017
  11336551
- tests: fix function name · d9854ddd
  Marian Rusu authored Nov 30, 2017 and Daniel Gorín committed Dec 04, 2017
  d9854ddd
- tests: fix function call · cdec1c8c
  Marian Rusu authored Nov 30, 2017 and Daniel Gorín committed Dec 04, 2017
  cdec1c8c
- use pytest-runner to run tests and lint · cf7be1f0
  Marian Rusu authored Nov 30, 2017 and Daniel Gorín committed Dec 04, 2017
  cf7be1f0
- use pkgs explicitly · f40b365d
  Marian Rusu authored Nov 28, 2017 and Daniel Gorín committed Dec 04, 2017
  f40b365d
Nov 23, 2017
- Move poll wait messages to debug log · 71dc390a
  Ben Brown authored Nov 10, 2017 and Daniel Gorín committed Nov 23, 2017
  71dc390a
- Silence new HTTPS connection message on non-debug · 869ec7b6
  Ben Brown authored Nov 10, 2017 and Daniel Gorín committed Nov 23, 2017
  
  869ec7b6
Nov 21, 2017
- Add feature to restrict marge to a specific branch · 3720bc2e
  Ben Brown authored Oct 26, 2017 and Daniel Gorín committed Nov 21, 2017
  
  3720bc2e
- Sleep less beteween merge requests · be9f94fb
  Alexander Schmolck authored Nov 16, 2017 and Daniel Gorín committed Nov 21, 2017
  
  be9f94fb