1. 10 Feb, 2016 1 commit
  2. 09 Feb, 2016 3 commits
  3. 08 Feb, 2016 3 commits
  4. 03 Feb, 2016 1 commit
  5. 02 Feb, 2016 3 commits
    • Robert Speicher's avatar
      Version 8.4.3 · eb6f6917
      Robert Speicher authored
      eb6f6917
    • Robert Speicher's avatar
      Merge branch 'rs-relax-autosize' into 'master' · 3033ec91
      Robert Speicher authored
      Allow manual resize of js-autosize textareas
      
      First, the autosize library was being too controlling and removed the
      `resize` property from any elements to which it was attached, removing
      the drag handle. We've disabled this behavior in the vendored library
      and added a spec to prevent a regression during an upgrade.
      
      Second, we detect (as best we can) when the user manually resizes an
      autosize textarea, and then remove the autosize behavior from it and
      increase its max-height.
      
      This should allow for the best of both worlds.
      
      Closes #12832
      
      See merge request !2653
      3033ec91
    • Yorick Peterse's avatar
      Merge branch 'expand-git-instrumentation' into 'master' · 503ad193
      Yorick Peterse authored
      Expand Git instrumentation
      
      This instruments some extra `Gitlab::Git` code as well as a collection of `Rugged` constants.
      
      See merge request !2664
      503ad193
  6. 01 Feb, 2016 5 commits
    • Drew Blessing's avatar
      Merge branch 'increase_lfs_size_column' into 'master' · 106722fa
      Drew Blessing authored
      Increase LFS objects size column
      
      Fixes #12745
      
      Increases the `size` column integer limit to an 8-byte integer. This allows for a max value of `9223372036854775807` which is 9,223,372,036 GB. That should do it 😃
      
      I tested this by first reproducing the error (push a file larger than 2.1 GB). The error was:
      
      ```
      RangeError (3145728000 is out of range for ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer with limit 4):
        lib/gitlab/lfs/response.rb:232:in `store_file'
        lib/gitlab/lfs/response.rb:170:in `render_lfs_upload_ok'
        lib/gitlab/lfs/response.rb:51:in `block in render_storage_upload_store_response'
        lib/gitlab/lfs/response.rb:204:in `render_response_to_push'
        lib/gitlab/lfs/response.rb:50:in `render_storage_upload_store_response'
        lib/gitlab/lfs/router.rb:76:in `put_response'
        lib/gitlab/lfs/router.rb:20:in `try_call'
        lib/gitlab/backend/grack_auth.rb:41:in `call'
        lib/gitlab/backend/grack_auth.rb:18:in `call_with_kerberos_support'
        lib/gitlab/backend/grack_auth.rb:8:in `call'
      ```
      
      Then I ran this migration and pushed the file again. It uploaded successfully.
      
      See merge request !2644
      106722fa
    • Robert Speicher's avatar
      Merge branch 'rs-ldap-user' into 'master' · f2faa007
      Robert Speicher authored
      Backport LDAP user assignment changes from EE
      
      See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146
      
      See merge request !2641
      f2faa007
    • Robert Speicher's avatar
      Merge branch 'update_sentry_gem' into 'master' · fa69b067
      Robert Speicher authored
      Update sentry-raven gem.
      
      Should resolve `fatal: Not a git repository (or any of the parent directories): .git` warnings.
      
      Fixes #12657
      
      See merge request !2636
      fa69b067
    • Robert Speicher's avatar
      Merge branch 'mr-merge-base' into 'master' · ff1e0ecf
      Robert Speicher authored
      Correctly determine MR diff base when MR has merge conflicts
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779
      
      See merge request !2632
      ff1e0ecf
    • Robert Speicher's avatar
      Merge branch 'highlight-blame' into 'master' · 3d687ec3
      Robert Speicher authored
      Fix highlighting in blame view.
      
      See merge request !2630
      3d687ec3
  7. 27 Jan, 2016 7 commits
  8. 26 Jan, 2016 9 commits
  9. 25 Jan, 2016 2 commits
  10. 22 Jan, 2016 6 commits