1. 16 Feb, 2016 1 commit
  2. 15 Feb, 2016 1 commit
  3. 14 Feb, 2016 1 commit
  4. 10 Feb, 2016 3 commits
    • Robert Speicher's avatar
      Merge branch 'bump-gitlab-git' into '8-4-stable' · b3889b7f
      Robert Speicher authored
      Bump gitlab_git to ~> 7.2.24
      
      bump gitlab_git to ~> 7.2.24 (closes: #13245)
      
      See merge request !2772
      b3889b7f
    • Kirill Smelkov's avatar
      Sync with upstream 8-4-stable · fe43272f
      Kirill Smelkov authored
      * origin/8-4-stable:
        Version 8.4.4
        Merge branch 'variables-build-log' into 'master'
        Update CHANGELOG
        Merge branch 'backup-database-timeout-fix' into 'master'
        Fix build/permissions.feature tests adding missing steps
        Limit guest access builds
        Merge branch 'omniauth-saml-update' into 'master'
        Version 8.4.3
        Merge branch 'rs-relax-autosize' into 'master'
      fe43272f
    • Robert Speicher's avatar
      Version 8.4.4 · 9c31cc6f
      Robert Speicher authored
      9c31cc6f
  5. 09 Feb, 2016 4 commits
  6. 08 Feb, 2016 3 commits
  7. 03 Feb, 2016 6 commits
  8. 02 Feb, 2016 9 commits
  9. 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
  10. 27 Jan, 2016 7 commits