1. 10 Jan, 2018 1 commit
  2. 09 Jan, 2018 4 commits
  3. 08 Jan, 2018 8 commits
  4. 07 Jan, 2018 6 commits
  5. 06 Jan, 2018 8 commits
  6. 05 Jan, 2018 3 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
    • Sandro Santilli's avatar
      Serve pull request .diff files (#3293) · a192f305
      Sandro Santilli authored
      * Serve pull request .diff files
      
      Closes #3259
      
      * Add test for pull request redirection and .diff access
      
      * Typo
      
      * There's no need to test for pr.BaseRepo being nil after calling GetBaseRepo
      a192f305
  7. 04 Jan, 2018 2 commits
  8. 03 Jan, 2018 5 commits
  9. 02 Jan, 2018 3 commits