1. 20 Apr, 2016 5 commits
    • Robert Speicher's avatar
      Merge branch 'license-templates-and-api-12804' into 'master' · 69821f1a
      Robert Speicher authored
      License templates when creating/editing a LICENSE file
      
      Closes #12804
      
      See merge request !3660
      69821f1a
    • Rémy Coutable's avatar
      Merge branch 'feature/raw-trace-output' into 'master' · aa49124e
      Rémy Coutable authored
      Add raw build trace output
      
      Closes #15308, #15147
      
      Changes in the UI:
      
      - on finished build:
      
          ![raw-on-finished-build](/uploads/0e0904940db5b381ae064d49343c6508/raw-on-finished-build.png)
      
      - on running build:
      
          ![raw-on-running-build](/uploads/0e4c800b68c12bdd0cbd2eea732b22ff/raw-on-running-build.png)
      
      See merge request !3767
      aa49124e
    • Rémy Coutable's avatar
      Merge branch 'slack_wiki_notifications' into 'master' · b255cbf3
      Rémy Coutable authored
      add slack notifications for wiki pages
      
      ## What does this MR do?
      
      Lets the Slack service be configured to send notifications when wiki pages are created or edited.
      
      ## Are there points in the code the reviewer needs to double check?
      
      I'm just starting to get familiar with the Gitlab codebase and I was unsure on how to get the wiki page url to pass it to the slack message, on whether or not I needed to refactor the create/update methods for wiki pages from the controller to a service (but seemed necessary to test it better), and if I needed to add a column to the web hooks table or if the services table would have been enough. Please let me know if I should change anything and I will improve the MR, thanks for checking :)
      
      ## Why was this MR needed?
      
      Related to #563 and fixes #4233.
      
      
      
      See merge request !2998
      b255cbf3
    • Robert Speicher's avatar
      Merge branch 'issue_15390' into 'master' · 413ff5b3
      Robert Speicher authored
      Fix javascript errors with invalid json because of commas
      
      fixes #15390 
      
      See merge request !3827
      413ff5b3
    • Robert Speicher's avatar
      Merge branch '15139-fix-constants-redefinition-warnings' into 'master' · e2903f28
      Robert Speicher authored
      Define constants only if not defined yet and freeze them
      
      Fixes #15139.
      
      See merge request !3810
      e2903f28
  2. 19 Apr, 2016 35 commits