1. 14 Jan, 2018 2 commits
  2. 13 Jan, 2018 1 commit
  3. 12 Jan, 2018 2 commits
  4. 11 Jan, 2018 2 commits
  5. 09 Jan, 2018 1 commit
  6. 07 Jan, 2018 2 commits
  7. 06 Jan, 2018 4 commits
  8. 05 Jan, 2018 2 commits
    • GiteaBot's avatar
      [skip ci] Updated translations via Crowdin · 15b8720c
      GiteaBot authored
      15b8720c
    • Lauris BH's avatar
      Add Pull Request merge options - Ignore white-space for conflict checking,... · 8ac1501a
      Lauris BH authored
      Add Pull Request merge options - Ignore white-space for conflict checking, Rebase, Squash merge (#3188)
      
      * Pull request options migration and UI in settings
      
      * Add ignore whitespace functionality
      
      * Fix settings if pull requests are disabled
      
      * Fix migration transaction
      
      * Merge with Rebase functionality
      
      * UI changes and related functionality for pull request merging button
      
      * Implement squash functionality
      
      * Fix rebase merging
      
      * Fix pull request merge tests
      
      * Add squash and rebase tests
      
      * Fix API method to reuse default message functions
      
      * Some refactoring and small fixes
      
      * Remove more hardcoded values from tests
      
      * Remove unneeded check from API method
      
      * Fix variable name and comment typo
      
      * Fix reset commit count after PR merge
      8ac1501a
  9. 03 Jan, 2018 1 commit
  10. 02 Jan, 2018 4 commits
  11. 01 Jan, 2018 1 commit
  12. 31 Dec, 2017 2 commits
  13. 22 Dec, 2017 1 commit
  14. 20 Dec, 2017 1 commit
  15. 12 Dec, 2017 2 commits
  16. 10 Dec, 2017 1 commit
  17. 08 Dec, 2017 3 commits
  18. 07 Dec, 2017 1 commit
  19. 04 Dec, 2017 1 commit
  20. 03 Dec, 2017 3 commits
  21. 29 Nov, 2017 3 commits