An error occurred fetching the project authors.
  1. 31 Jan, 2017 6 commits
  2. 18 Jan, 2017 1 commit
  3. 11 Jan, 2017 1 commit
  4. 03 Jan, 2017 1 commit
  5. 21 Dec, 2016 3 commits
  6. 19 Dec, 2016 4 commits
  7. 17 Dec, 2016 1 commit
  8. 16 Dec, 2016 3 commits
  9. 15 Dec, 2016 1 commit
    • Luke Bennett's avatar
      Changed autocomplete_sources into an action that returns a single 'at' type of sources at a time · 1356e40f
      Luke Bennett authored
      Finished up autocomplete_sources action and added frontend to fetch data only when its needed
      
      Added wait_for_ajax to specs
      
      Fixed builds and improved the setup/destroy lifecycle
      
      Changed global namespace and DRYed up loading logic
      
      Added safety for accidentally loading data twice
      
      Removed destroy as its not necessary and is messing with click events from a blur race condition
      
      Created AutocompleteSourcesController and updated routes
      
      Fixed @undefined from tabbing before load ends
      
      Disable tabSelectsMatch until we have loaded data
      
      Review changes
      1356e40f
  10. 30 Nov, 2016 1 commit
  11. 23 Nov, 2016 1 commit
  12. 17 Nov, 2016 3 commits
  13. 09 Nov, 2016 1 commit
    • Toon Claes's avatar
      Add button to delete all merged branches · 1afab9eb
      Toon Claes authored
      It adds a button to the branches page that the user can use to delete
      all the branches that are already merged. This can be used to clean up
      all the branches that were forgotten to delete while merging MRs.
      
      Fixes #21076.
      1afab9eb
  14. 07 Nov, 2016 2 commits
  15. 17 Oct, 2016 2 commits
  16. 14 Oct, 2016 1 commit
  17. 13 Oct, 2016 1 commit
    • Sean McGivern's avatar
      Allow setting content for resolutions · 3f71c43e
      Sean McGivern authored
      When reading conflicts:
      
      1. Add a `type` field. `text` works as before, and has `sections`;
         `text-editor` is a file with ambiguous conflict markers that can only
         be resolved in an editor.
      2. Add a `content_path` field pointing to a JSON representation of the
         file's content for a single file.
      3. Hitting `content_path` returns a similar datastructure to the `file`,
         but without the `content_path` and `sections` fields, and with a
         `content` field containing the full contents of the file (with
         conflict markers).
      
      When writing conflicts:
      
      1. Instead of `sections` being at the top level, they are now in a
         `files` array. This matches the read format better.
      2. The `files` array contains file hashes, each of which must contain:
         a. `new_path`
         b. `old_path`
         c. EITHER `sections` (which works as before) or `content` (with the
            full content of the resolved file).
      3f71c43e
  18. 11 Oct, 2016 2 commits
  19. 06 Oct, 2016 3 commits
  20. 05 Oct, 2016 1 commit