1. 30 Jan, 2016 7 commits
  2. 29 Jan, 2016 20 commits
    • Josh Frye's avatar
      Change ttl to 1 minute · a6d6cfaf
      Josh Frye authored
      a6d6cfaf
    • Josh Frye's avatar
      d8a292d9
    • Achilleas Pipinellis's avatar
      Merge branch 'patch-1' into 'master' · dec21517
      Achilleas Pipinellis authored
      Fixed typo for PRIVATE-TOKEN header
      
      Was PRIVATE_TOKEN but should be PRIVATE-TOKEN.
      Underscore vs. kebab-case.
      
      See merge request !2624
      dec21517
    • Robert Speicher's avatar
      Merge branch 'patch-1' into 'master' · 01439ab9
      Robert Speicher authored
      add missing `RAILS_ENV=production` bit to bundle command
      
      [ci skip]
      
      See merge request !2626
      01439ab9
    • Douglas Barbosa Alexandre's avatar
      Merge branch 'fix-viewing-wiki-page-lastest-version-via-version-id' into 'master' · a8b7ac91
      Douglas Barbosa Alexandre authored
      Fix "old version" warning when viewing wiki page's latest version via version_id in URL
      
      Fixes #12712
      
      See merge request !2627
      a8b7ac91
    • Drew Blessing's avatar
      Merge branch 'increase_lfs_size_column' into 'master' · 7ede227a
      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
      7ede227a
    • Douglas Barbosa Alexandre's avatar
    • Jacob Schatz's avatar
      Merge branch 'focus-emoji-search-field' into 'master' · b4b41b4c
      Jacob Schatz authored
      Auto-focus emoji award search field
      
      ![emoji-search-focus](/uploads/7cd0448e00ced19d3cf1c4fdd141c74f/emoji-search-focus.gif)
      
      Closes #12621 
      
      cc. @jschatz1 
      
      See merge request !2650
      b4b41b4c
    • Drew Blessing's avatar
      Increase LFS objects size column · 873f336e
      Drew Blessing authored
      873f336e
    • Josh Frye's avatar
      Update CHANGELOG · f255313e
      Josh Frye authored
      f255313e
    • Josh Frye's avatar
      91b9cbff
    • Dmitriy Zaporozhets's avatar
      Merge branch 'note-background-job' into 'master' · 22772871
      Dmitriy Zaporozhets authored
      Background process note logic for #3948
      
      Quick and dirty way to get *most* of the note processing out of band and into the background. Seeing some pretty nice speed bumps. Keep in mind that doing this in process results in slower and slower responses as more notes are added and more participants exist.
      
      ```
      without background processing
        Completed 200 OK in 627ms (Views: 0.5ms | ActiveRecord: 32.3ms)
        Completed 200 OK in 478ms (Views: 0.8ms | ActiveRecord: 28.3ms)
        Completed 200 OK in 1107ms (Views: 0.6ms | ActiveRecord: 36.6ms)
      
      with background processing
        Completed 200 OK in 108ms (Views: 0.6ms | ActiveRecord: 4.7ms)
        Completed 200 OK in 78ms (Views: 0.5ms | ActiveRecord: 4.5ms)
        Completed 200 OK in 164ms (Views: 0.5ms | ActiveRecord: 8.3ms)
      ```
      
      As you can see, speeds are consistent when doing the harder work out of process. I'm not sure the number of sql queries we're saving, but based on the logs alone it's a pretty good amount.
      
      @dzaporozhets @yorickpeterse I would love some input on this.
      
      See merge request !2631
      22772871
    • Dmitriy Zaporozhets's avatar
      Merge branch 'rs-remove-ip-blocking' into 'master' · e221990e
      Dmitriy Zaporozhets authored
      Partially revert "Add IP check against DNSBLs at account sign-up"
      
      This partially reverts 6a5cd3ca - we keep the migration and add a new
      migration that reverts it in order to keep migration history intact.
      
      See merge request !2643
      e221990e
    • Phil Hughes's avatar
      Added tests to emoji search field focus · 5a04fc90
      Phil Hughes authored
      5a04fc90
    • Phil Hughes's avatar
      Auto-focus emoji award search field · 1b978727
      Phil Hughes authored
      Closes #12621
      1b978727
    • Dmitriy Zaporozhets's avatar
      Merge branch 'rs-transient-capybara-timeout' into 'master' · f5860ce6
      Dmitriy Zaporozhets authored
      Prevent transient Capybara timeouts during feature tests
      
      The problem occurred because asset compilation takes a long time, so
      when the asset cache didn't exist and the first test ran, it would often
      (randomly) time out during the generation before the actual test even
      had a chance to run.
      
      Now we check if the cache exists before the suite runs, and if not, we
      manually fire a request to the root URL in order to generate it. This
      should allow subsequent tests to use the cached assets.
      
      See merge request !2646
      f5860ce6
    • Dmitriy Zaporozhets's avatar
      Merge branch 'rs-revert-revert-remove-coffee-filters' into 'master' · 74e1add2
      Dmitriy Zaporozhets authored
      Revert "Revert "Remove the `:coffee` and `:coffeescript` Haml filters""
      
      This reverts commit b0145d76.
      
      See merge request !2642
      74e1add2
    • Marin Jankovski's avatar
      Merge branch 'hotfix/ruby-21-broken-update' into 'master' · 9d0065f0
      Marin Jankovski authored
      fix syntax error on 2.1 and rubocop on 2.2
      
      Background:
      
      Hashes `{:'key': 'value'}` are not valid in 2.1 but are recommended by Rubocop on 2.2. We only use those when we have a key such as `weird-key`, `weird.key`, etc... 
      
      We could disable Rubocop but it wouldn't warn us about the recommended syntax since `Ruby 1.9`: `{key: 'value'}`, which is valid for `Ruby 1.9+`.
      
      Workaround 1 could be disabling `Style/HashSyntax:` in `rubocop.yml`. 
      
      Workaround 2 (tried in this MR) is to trick Rubocop using `.to_sym` which is effectively the same as adding the `:`. This would allow to keep the warning in place.
      
      Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12801
      
      See merge request !2637
      9d0065f0
    • Robert Speicher's avatar
      Prevent transient Capybara timeouts during feature tests · bbe0fa91
      Robert Speicher authored
      The problem occurred because asset compilation takes a long time, so
      when the asset cache didn't exist and the first test ran, it would often
      (randomly) time out during the generation before the actual test even
      had a chance to run.
      
      Now we check if the cache exists before the suite runs, and if not, we
      manually fire a request to the root URL in order to generate it. This
      should allow subsequent tests to use the cached assets.
      bbe0fa91
    • Sytse Sijbrandij's avatar
      92c04ecb
  3. 28 Jan, 2016 13 commits