1. 28 Jun, 2017 4 commits
    • Lin Jen-Shin's avatar
      Merge remote-tracking branch 'upstream/master' into 15041-Add-Custom-CI-Config-Path · 35674fcd
      Lin Jen-Shin authored
      * upstream/master: (12506 commits)
        Update CHANGELOG.md for 9.3.2
        Update architecture.md
        Fix changelog entry file extension
        Fix head pipeline stored in merge request for external pipelines
        updated gitlab-ci.yml to compile locale
        Ignore JSON files generated from PO files
        Update mmap2 gem tha disables mmap_obj.gsub! as current implementation uses method that is no longer part of Ruby API
        Disable rainbow during SimpleExecutor specs to have consistence
        Slightly refactor pipeline schedules form in preparation for additions
        Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter submits twice and refreshes page"
        Make the SimpleExecutor rescue exceptions in the executing Checks
        Resolve "Unable to access edit comment from dropdown menu in certain screen sizes"
        Update changelog item
        revert removal of requestAnimationFrame and move to a separate MR/discussion
        rename getEmojiCategoryMap and remove unnecessary parameter
        Action Buttons on Prio Labels working again by setting pointer events to none on…
        Remove 'contains' option from Commit.find_all
        Remove Gitlab::Git::Repository#find_all
        Use latest chrome and chrome driver in GitLab QA
        Polish sidebar toggle
        ...
      35674fcd
    • Tim Zallmann's avatar
      Merge branch 'refactor-emoji-utils' into 'master' · 08ad0af4
      Tim Zallmann authored
      Refactor emoji helpers in preparation for async loading
      
      See merge request !12432
      08ad0af4
    • Clement Ho's avatar
      Update CHANGELOG.md for 9.3.2 · a7f114b1
      Clement Ho authored
      [ci skip]
      a7f114b1
    • Sid Sijbrandij's avatar
      Update architecture.md · 604db40b
      Sid Sijbrandij authored
      604db40b
  2. 27 Jun, 2017 36 commits