1. 01 Apr, 2016 2 commits
  2. 31 Mar, 2016 25 commits
  3. 30 Mar, 2016 13 commits
    • Yorick Peterse's avatar
      Merge branch 'reorder-project-expire-cache' into 'master' · 84764847
      Yorick Peterse authored
      Expire the exists cache before deletion to ensure project dir actually exists
      
      See merge request !3413
      84764847
    • Yorick Peterse's avatar
      Merge branch 'check-project-repo-exists' into 'master' · c4ece04b
      Yorick Peterse authored
      Check if repo exists before attempting to update cache info
      
      See merge request !3414
      c4ece04b
    • Robert Speicher's avatar
      Merge branch 'cleanup-system-hook-spec' into 'master' · 79467437
      Robert Speicher authored
      minor cleanup in system_hook_spec
      
      Clean up extracted from !3439
      
      See merge request !3459
      79467437
    • Jacob Schatz's avatar
      Merge branch '14547_todo-click' into 'master' · 2fb7392e
      Jacob Schatz authored
      Make entire todo row clickable
      
      Fixes #14547 
      
      I had some issues with timeouts when searching for the selector to click on, so I ended up using `execute_script`. Please let me know if you think there's a better solution
      
      See merge request !3456
      2fb7392e
    • Dmitriy Zaporozhets's avatar
      Merge branch 'precompile-emoji-urls' into 'master' · fa9d140f
      Dmitriy Zaporozhets authored
      Pre-calculate Emoji digests
      
      cc @dzaporozhets @rspeicher 
      
      @marin Do you happen to know if we allow users to configure asset hosts anywhere in Omnibus and such? I've not been able to find any reference to "asset_host" so it seems we don't allow this (which is a good thing as this simplifies the code).
      
      See merge request !3458
      fa9d140f
    • Zeger-Jan van de Weg's avatar
      minor cleanup in system_hook_spec · 4b1ad75a
      Zeger-Jan van de Weg authored
      4b1ad75a
    • Yorick Peterse's avatar
      Pre-calculate Emoji digests · 5830d80b
      Yorick Peterse authored
      By pre-calculating the digests we can manually construct the emoji URLs,
      removing the need for using Rails' asset URL helpers. The reason we
      don't want to use these helpers for Emojis is two-fold:
      
      1. Rails' image_url() method is slow, really slow. For one it _might_
         have to calculate digests but it also performs a lot of other
         intensive operations (judging by the source code and based on
         measuring timings).
      
      2. We have a lot of Emoji which coupled with the above can result in it
         taking minutes to load Emoji autocomplete data.
      
      Using this pre-calculation setup generating the digests takes around 7
      seconds (including the time it takes to start Rails/Rake), and only
      around 600 milliseconds to load _all_ the autocomplete data of a project
      (measured locally).
      
      This commit _does_ change the Emoji URLs from absolute to relative URLs
      as these are much easier to generate.
      
      To update the Emoji data simply run:
      
          rake gemojione:digests
      
      Then commit any changes.
      
      Fixes gitlab-org/gitlab-ce#14009
      5830d80b
    • Annabel Dunstone's avatar
      Clear .todo listener · f79687ea
      Annabel Dunstone authored
      f79687ea
    • Annabel Dunstone's avatar
      0591a782
    • Annabel Dunstone's avatar
      Make entire todo row clickable · 51031a68
      Annabel Dunstone authored
      51031a68
    • Robert Speicher's avatar
      Merge branch 'tests/isolate-carrierwave-uploads' into 'master' · 673bb9ef
      Robert Speicher authored
      Isolate CarrierWave uploads in test enviroment
      
      Purpose of this merge request is to isolate CarrierWave uploads in test environment, from regular development/production uploads.
      We need to persist some files in order to test some features thoroughly. If we - for example - want to check if file exists after being uploaded via API, or we need to write tests that check if file has been correctly removed we need to persist uploads using CarrierWave.
      
      This approach simply sets `root` path for uploads in test environment and removes temporary directory after executing RSpec tests suite. We set this in `spec_helper` to keep this in one place, this also can be set up in test environment initializer.
      
      This issue is a workaround for #12968, but does not solve this problem completely, because if uploader defines absolute path in `store_dir` or defines custom `root` path, this may not work correctly (but it looks like we do have such uploaders at this moment).
      
      See merge request !3435
      673bb9ef
    • Douwe Maan's avatar
      Merge branch '2364-fallback-to-in-reply-to-header' into 'master' · c9a7cc4b
      Douwe Maan authored
      Fall back to In-Reply-To and References headers when sub-addressing is not available
      
      _Originally opened at !3024 by @dabit._
      
      - - -
      
      Fixes #2364 
      
      Summary of the changes:
      - No more need to have the `%{key}` placeholder in the `incoming_email.address`
      - The fallback message id format is `reply-[key]@[gitlab_host]` (reminder: it doesn't have to be a real email address)
      - The fallback message id that includes the reply key is added to both `References` header
      - Documentation for the "Reply by email" feature updated
      
      See merge request !3305
      c9a7cc4b
    • Robert Speicher's avatar
      Merge branch 'patch/fix-mergerequest-diff' into 'master' · 3d484861
      Robert Speicher authored
      Fix Raw / Rendered diff producing different results on merge requests
      
      The raw diff endpoint (`merge_requests/####.diff`) produces a diff based on `target_branch` instead of the original branching point. Same is valid for `merge_requests/####.patch`.
      
      Fixes #14680, #3017
      
      See merge request !3450
      3d484861