1. 19 Aug, 2016 4 commits
    • Robert Speicher's avatar
      Merge branch '4273-slash-commands' into 'master' · 16884719
      Robert Speicher authored
      Support slash commands in issues / MR description & comments
      
      See merge request !5021
      16884719
    • Jacob Schatz's avatar
      Merge branch... · abb1a595
      Jacob Schatz authored
      Merge branch '3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a-file-in-the-webui' into 'master'
      
      Fix Ace syntax highlighting with compiled assets
      
      ## What does this MR do?
      
      Update ACE to 4.1.0 to allow modes (syntax highlighting files for particular languages) to be lazily loaded.
      
      ## Are there points in the code the reviewer needs to double check?
      
      Don't think so.
      
      ## Why was this MR needed?
      
      Syntax highlighting in the file editor only worked in development and test modes, not in production!
      
      ## What are the relevant issue numbers?
      
      Closes #3225.
      
      ## Screenshots (if relevant)
      
      First, the test setup - add these lines to `development.rb`:
      ```ruby
        config.assets.debug = false
        config.assets.compile = false
        config.assets.digest = true
      ```
      
      Then, before starting the server, run `bundle exec rake assets:clobber assets:precompile`.
      
      Before:
      
      ![image](/uploads/486198e273019f8969d2e90560d82928/image.png)
      
      There is an error in the console because `/assets/ace/mode-ruby.js` was not found (it's only available when assets are compiled on demand).
      
      After:
      
      ![image](/uploads/6aa0d69b7efdfd6fe6aa22b9a49e9716/image.png)
      
      This loads `/assets/ace/mode-ruby-3915f95a6cc47306b1305e4dcb7aca25b2ef9c49b18ec6011707135b6575d8f3.js`, which works because the precompile step included it and told ACE where to find it.
      
      ## Does this MR meet the acceptance criteria?
      
      - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
      - ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
      - ~~API support added~~
      - Tests
        - ~~Added for this feature/bug~~
        - [x] All builds are passing
      - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
      - [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
      - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
      
      See merge request !5501
      abb1a595
    • Robert Speicher's avatar
      Merge branch 'rs-issue-21017' into 'master' · 0ff39331
      Robert Speicher authored
      Update Hamlit to 2.6.1
      
      Fixes gitlab-org/gitlab-ce#21025 and gitlab-org/gitlab-ce#21017
      
      See merge request !5873
      0ff39331
    • Robert Speicher's avatar
      Merge branch 'rs-update-doorkeeper' into 'master' · 2e66559e
      Robert Speicher authored
      Update doorkeeper to 4.2.0
      
      Changelog: https://git.io/v6PnV
      
      See merge request !5881
      2e66559e
  2. 18 Aug, 2016 1 commit
  3. 17 Aug, 2016 1 commit
  4. 11 Aug, 2016 2 commits
  5. 09 Aug, 2016 1 commit
  6. 08 Aug, 2016 1 commit
  7. 05 Aug, 2016 1 commit
  8. 03 Aug, 2016 1 commit
  9. 29 Jul, 2016 1 commit
  10. 28 Jul, 2016 2 commits
  11. 27 Jul, 2016 1 commit
  12. 26 Jul, 2016 3 commits
  13. 25 Jul, 2016 1 commit
  14. 24 Jul, 2016 1 commit
  15. 22 Jul, 2016 2 commits
  16. 21 Jul, 2016 3 commits
  17. 18 Jul, 2016 3 commits
  18. 14 Jul, 2016 1 commit
  19. 13 Jul, 2016 3 commits
  20. 12 Jul, 2016 7 commits