An error occurred fetching the project authors.
  1. 26 Jul, 2016 1 commit
  2. 20 Jul, 2016 1 commit
  3. 19 Jul, 2016 2 commits
  4. 14 Jul, 2016 1 commit
  5. 12 Jul, 2016 2 commits
  6. 08 Jul, 2016 3 commits
  7. 07 Jul, 2016 1 commit
  8. 06 Jul, 2016 5 commits
  9. 28 Jun, 2016 1 commit
  10. 24 Jun, 2016 2 commits
    • Rémy Coutable's avatar
      Fix a wrong MR status when merge_when_build_succeeds &... · e3d464d8
      Rémy Coutable authored
      Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true
      
      The issue was that `MergeRequest#mergeable?` returns false when the CI
      state is not success and project.only_allow_merge_if_build_succeeds is
      true. In this case `Projects::MergeRequestsController#merge` would
      return the `:failed` status when enabling `merge_when_build_succeeds`,
      thus leading to a weird state and the MR never automatically merged.
      
      The fix is to disable the CI state check in the controller safeguard
      that early return the `:failed` status.
      Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
      e3d464d8
    • Yorick Peterse's avatar
      Support for rendering/redacting multiple documents · d470f3d1
      Yorick Peterse authored
      This commit changes the way certain documents are rendered (currently
      only Notes) and how documents are redacted. Previously both rendering
      and redacting would run on a per document basis. The result of this was
      that for every document we'd have to run countless queries just to
      figure out if we could display a set of links or not.
      
      This commit changes things around so that redacting Markdown documents
      is no longer tied into the html-pipeline Gem. This in turn allows it to
      redact multiple documents in a single pass, thus reducing the number of
      queries needed.
      
      In turn rendering issue/merge request notes has been adjusted to take
      advantage of this new setup. Instead of rendering Markdown somewhere
      deep down in a view the Markdown is rendered and redacted in the
      controller (taking the current user and all that into account). This has
      been done in such a way that the "markdown()" helper method can still be
      used on its own.
      
      This particular commit also paves the way for caching rendered HTML on
      object level. Right now there's an accessor method Note#note_html which
      is used for setting/getting the rendered HTML. Once we cache HTML on row
      level we can simply change this field to be a column and call a "save"
      whenever needed and we're pretty much done.
      d470f3d1
  11. 23 Jun, 2016 2 commits
  12. 16 Jun, 2016 2 commits
  13. 15 Jun, 2016 2 commits
  14. 14 Jun, 2016 2 commits
  15. 07 Jun, 2016 1 commit
  16. 06 Jun, 2016 2 commits
  17. 03 Jun, 2016 4 commits
  18. 02 Jun, 2016 1 commit
  19. 01 Jun, 2016 1 commit
    • Sean McGivern's avatar
      Don't allow merges with new commits · f680eca9
      Sean McGivern authored
      Set a `sha` parameter on the MR form. If this doesn't match the HEAD of
      the source branch when the form is submitted, show a warning (like with
      a merge conflict) and don't merge the branch.
      f680eca9
  20. 31 May, 2016 1 commit
  21. 25 May, 2016 1 commit
  22. 20 May, 2016 1 commit
  23. 19 May, 2016 1 commit