summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change ttl to 1 minutecache-broadcast-message-currentJosh Frye2016-01-291-1/+1
|
* Cache BroadcastMessage.current for 5 minutes. Fixes #12770Josh Frye2016-01-291-1/+3
|
* Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-01-291-5/+5
|\ | | | | | | | | | | | | | | Fixed typo for PRIVATE-TOKEN header Was PRIVATE_TOKEN but should be PRIVATE-TOKEN. Underscore vs. kebab-case. See merge request !2624
| * Fixed typo for PRIVATE-TOKEN header Markus Fisch2016-01-271-5/+5
| | | | | | | | Was PRIVATE_TOKEN but should be PRIVATE-TOKEN. Underscore vs. kebab-case.
* | Merge branch 'patch-1' into 'master' Robert Speicher2016-01-291-1/+1
|\ \ | | | | | | | | | | | | | | | | | | add missing `RAILS_ENV=production` bit to bundle command [ci skip] See merge request !2626
| * | add missing `RAILS_ENV=production` bit to bundle commandMaverik Gately2016-01-271-1/+1
| |/
* | Merge branch 'fix-viewing-wiki-page-lastest-version-via-version-id' into ↵Douglas Barbosa Alexandre2016-01-292-1/+33
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix "old version" warning when viewing wiki page's latest version via version_id in URL Fixes #12712 See merge request !2627
| * | Fix old version warning when viewing wiki latest version via version_idfix-viewing-wiki-page-lastest-version-via-version-idDouglas Barbosa Alexandre2016-01-292-1/+33
| | |
* | | Merge branch 'increase_lfs_size_column' into 'master' Drew Blessing2016-01-293-3/+11
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 :smiley: 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
| * | Increase LFS objects size columnDrew Blessing2016-01-293-3/+11
| | |
* | | Merge branch 'focus-emoji-search-field' into 'master' Jacob Schatz2016-01-294-1/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Auto-focus emoji award search field ![emoji-search-focus](/uploads/7cd0448e00ced19d3cf1c4fdd141c74f/emoji-search-focus.gif) Closes #12621 cc. @jschatz1 See merge request !2650
| * | Added tests to emoji search field focusPhil Hughes2016-01-292-0/+7
| | |
| * | Auto-focus emoji award search fieldPhil Hughes2016-01-292-1/+2
| | | | | | | | | | | | Closes #12621
* | | Merge branch 'note-background-job' into 'master' Dmitriy Zaporozhets2016-01-296-21/+72
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix Rubocop errornote-background-jobJosh Frye2016-01-281-3/+3
| | | |
| * | | Update testsJosh Frye2016-01-282-3/+27
| | | |
| * | | [WIP] Background process note logic for #3948Josh Frye2016-01-284-18/+45
| | | |
* | | | Merge branch 'rs-remove-ip-blocking' into 'master' Dmitriy Zaporozhets2016-01-2910-235/+8
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-2810-235/+8
| | | | | | | | | | | | | | | | | | | | This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact.
* | | | Merge branch 'rs-transient-capybara-timeout' into 'master' Dmitriy Zaporozhets2016-01-293-5/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Prevent transient Capybara timeouts during feature testsrs-transient-capybara-timeoutRobert Speicher2016-01-283-5/+26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'rs-revert-revert-remove-coffee-filters' into 'master' Dmitriy Zaporozhets2016-01-291-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Revert "Remove the `:coffee` and `:coffeescript` Haml filters"" This reverts commit b0145d765b94d2cef86b10b6dd22895779cfef33. See merge request !2642
| * | | | Revert "Revert "Remove the `:coffee` and `:coffeescript` Haml filters""rs-revert-revert-remove-coffee-filtersRobert Speicher2016-01-281-0/+6
| | | | | | | | | | | | | | | | | | | | This reverts commit b0145d765b94d2cef86b10b6dd22895779cfef33.
* | | | | Merge branch 'hotfix/ruby-21-broken-update' into 'master' Marin Jankovski2016-01-293-8/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | add back master only for ruby 2.1 imagesJames Lopez2016-01-281-6/+4
| | | | | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-01-2840-313/+569
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | hotfix/ruby-21-broken-update
| * | | | | trick rubocop and temporarily add ruby 2.1 images for any branchJames Lopez2016-01-284-12/+14
| | | | | |
* | | | | | Make changes in config/initializers/1_settings.rbSytse Sijbrandij2016-01-281-0/+1
| |_|_|/ / |/| | | |
* | | | | Merge branch 'mr-merge-base' into 'master' Robert Speicher2016-01-287-22/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly determine MR diff base when MR has merge conflicts Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779 See merge request !2632
| * \ \ \ \ Merge branch 'master' into mr-merge-basemr-merge-baseDouwe Maan2016-01-2845-95/+147
| |\ \ \ \ \
| * | | | | | Fix specsDouwe Maan2016-01-284-4/+7
| | | | | | |
| * | | | | | Correctly determine MR diff base when MR has merge conflictsDouwe Maan2016-01-275-22/+19
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-286-43/+84
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Fix highlighting in blame view. See merge request !2630
| * | | | | Fix changeloghighlight-blameDouwe Maan2016-01-281-3/+1
| | | | | |
| * | | | | Merge branch 'master' into highlight-blameDouwe Maan2016-01-2845-95/+147
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Move blame group logic to dedicated classDouwe Maan2016-01-285-43/+81
| | | | | |
| * | | | | Fix highlighting in blame view.Douwe Maan2016-01-273-4/+7
| | |/ / / | |/| | |
* | | | | Merge branch 'rs-ldap-user' into 'master' Robert Speicher2016-01-281-7/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport LDAP user assignment changes from EE See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146 See merge request !2641
| * | | | | Backport LDAP user assignment changes from EERobert Speicher2016-01-281-7/+8
| | |_|/ / | |/| | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146
* | | | | Merge branch 'update_sentry_gem' into 'master' Robert Speicher2016-01-281-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Update sentry-raven gem.update_sentry_gemMarin Jankovski2016-01-281-1/+1
| |/ / /
* | | | Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets2016-01-2818-22/+205
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show list of forks for a given Project Closes #2406 See merge request !2376
| * | | | Align filter dropdown.issue_2406Rubén Dávila2016-01-271-0/+4
| | | | |
| * | | | Remove no longer required CSS rule.Rubén Dávila2016-01-201-4/+0
| | | | |
| * | | | Refactor some CSS rules.Rubén Dávila2016-01-202-6/+17
| | | | |
| * | | | Some fixes from last code review.Rubén Dávila2016-01-204-5/+5
| | | | |
| * | | | Some CSS and sorting fixes.Rubén Dávila2016-01-203-19/+30
| | | | |
| * | | | Fix broken spec.Rubén Dávila2016-01-201-1/+3
| | | | |
| * | | | Add specs for Forks listing.Rubén Dávila2016-01-202-0/+40
| | | | |
| * | | | Add icon for private forks notice. #2406Rubén Dávila2016-01-203-2/+16
| | | | |