summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove executable bit from images for docs lintsh-remove-docs-executableStan Hu2017-11-174-0/+0
| | | | This was causing a docs lint failure in https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/40901316.
* Merge branch 'mk-bandaid-db-rollback-failures' into 'master'Robert Speicher2017-11-171-1/+1
|\ | | | | | | | | Rollback to a safer place to stop See merge request gitlab-org/gitlab-ce!15465
| * Rollback to a safer place to stopMichael Kozono2017-11-171-1/+1
|/
* Merge branch '4056-hashed-storage-upload-transfers' into 'master'Stan Hu2017-11-171-1/+11
|\ | | | | | | | | | | | | Fix project transfer with hashed-storage attachments Closes gitlab-ee#4056 See merge request gitlab-org/gitlab-ce!15457
| * Fix project transfer with hashed-storage attachmentsNick Thomas2017-11-171-1/+11
| |
* | Merge branch 'restrict-update-column-in-batches-for-large-tables' into 'master'Robert Speicher2017-11-1731-67/+153
|\ \ | | | | | | | | | | | | Restrict update column in batches for large tables See merge request gitlab-org/gitlab-ce!15458
| * | Add computed update docs for update_column_in_batchesSean McGivern2017-11-172-1/+46
| | |
| * | Prevent update_column_in_batches on large tablesSean McGivern2017-11-1729-66/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add_column_with_default is implemented in terms of update_column_in_batches, but update_column_in_batches can be used independently. Neither of these should be used on the specified large tables, because they will cause issues on large instances like GitLab.com. This also ignores the cop for all existing migrations, renaming AddColumnWithDefaultToLargeTable where appropriate.
* | | Merge branch 'improved-changes-dropdown' into 'master'Filipa Lacerda2017-11-176-11/+46
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improved the design of the changed files dropdown Closes #36687 See merge request gitlab-org/gitlab-ce!15367
| * | | moved magic number into variablesimproved-changes-dropdownPhil Hughes2017-11-171-1/+2
| | | |
| * | | changed text color of pathPhil Hughes2017-11-171-0/+1
| | | |
| * | | updated dropdown widthPhil Hughes2017-11-171-1/+1
| | | |
| * | | updated to use new sprite iconsPhil Hughes2017-11-173-4/+6
| | | |
| * | | Improved the design of the changed files dropdownPhil Hughes2017-11-174-8/+39
| | |/ | |/| | | | | | | Closes #36687
* | | Merge branch 'qa/gb/fix-subject-address-in-factories' into 'master'Robert Speicher2017-11-172-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix QA test subject address by configuring capybara Closes gitlab-qa#113 See merge request gitlab-org/gitlab-ce!15446
| * | | Fix QA test subject address by configuring capybaraqa/gb/fix-subject-address-in-factoriesGrzegorz Bizon2017-11-172-0/+3
| | | |
* | | | Merge branch 'bvl-fix-count-with-selects' into 'master'Douwe Maan2017-11-173-1/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the selects when counting the last page Closes #40266 See merge request gitlab-org/gitlab-ce!15456
| * | | | Remove the selects when counting the last pageBob Van Landuyt2017-11-173-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The last page of the first collection is only loaded into memory when it is being viewed. If it isn't loaded into memory, the `#size` call triggers a count query. This `#count` would generate an invalid query if our custom preloaded counts are included by adding a separate `as count_column` alias on top of the count aliases. Removing the selects in this case will make sure a valid `COUNT(*)` is generated.
* | | | | Merge branch 'mk-add-user-rate-limits' into 'master'Douwe Maan2017-11-1717-140/+984
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add request rate limits Closes #30053 See merge request gitlab-org/gitlab-ce!14708
| * | | | | Renaming AuthenticationException to AuthenticationErrormk-add-user-rate-limitsFrancisco Lopez2017-11-173-10/+10
| | | | | |
| * | | | | Changes after rebaseFrancisco Lopez2017-11-172-23/+6
| | | | | |
| * | | | | Removing OffenderFrancisco Lopez2017-11-171-1/+0
| | | | | |
| * | | | | Moved Exceptions to Gitlab::AuthFrancisco Lopez2017-11-178-48/+51
| | | | | |
| * | | | | Moving exceptions to UserAuthFindersFrancisco Lopez2017-11-176-49/+52
| | | | | |
| * | | | | Leaving atom? query to fix testsFrancisco Lopez2017-11-171-1/+1
| | | | | |
| * | | | | Change the rss url guard clauseFrancisco Lopez2017-11-172-6/+4
| | | | | |
| * | | | | Added some more commentsFrancisco Lopez2017-11-174-15/+14
| | | | | |
| * | | | | Removed method handle_return_valueFrancisco Lopez2017-11-171-13/+8
| | | | | |
| * | | | | Added UserAuthFinders specFrancisco Lopez2017-11-172-2/+196
| | | | | |
| * | | | | Added RequestAuthenticator specFrancisco Lopez2017-11-171-0/+67
| | | | | |
| * | | | | Homogenising the type of the request handled by UserAuthFinder. Also tests fixedFrancisco Lopez2017-11-174-29/+32
| | | | | |
| * | | | | Applied some code review commentsFrancisco Lopez2017-11-174-32/+29
| | | | | |
| * | | | | Removing private tokenFrancisco Lopez2017-11-173-34/+16
| | | | | |
| * | | | | Some fixes after rebaseFrancisco Lopez2017-11-174-96/+41
| | | | | |
| * | | | | Updated refactor and pushing to see if test failsFrancisco Lopez2017-11-173-44/+19
| | | | | |
| * | | | | Pushing to see how this tests behavesFrancisco Lopez2017-11-171-7/+7
| | | | | |
| * | | | | First refactorFrancisco Lopez2017-11-174-82/+116
| | | | | |
| * | | | | Add link to discussionMichael Kozono2017-11-171-0/+4
| | | | | |
| * | | | | Remove extra attemptsMichael Kozono2017-11-171-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get the tests deterministic or bust! Also, explain what the constants are doing and why. And don’t output the log message if it doesn’t apply.
| * | | | | Dry up URLs and get args constructionMichael Kozono2017-11-171-36/+48
| | | | | |
| * | | | | Prevent affecting other testsMichael Kozono2017-11-171-4/+4
| | | | | |
| * | | | | Refactor application setting managementMichael Kozono2017-11-171-41/+35
| | | | | |
| * | | | | Refactor with ActionDispatch::RequestMichael Kozono2017-11-171-13/+11
| | | | | |
| * | | | | Don't add methods to Rack::AttackMichael Kozono2017-11-171-10/+12
| | | | | |
| * | | | | Fix Rubocop offensesMichael Kozono2017-11-171-13/+13
| | | | | |
| * | | | | Fix OAuth API and RSS rate limitingMichael Kozono2017-11-175-112/+244
| | | | | |
| * | | | | Allow throttling code in test environmentMichael Kozono2017-11-172-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | This code should not break other tests because the rate limits are off by default.
| * | | | | Add Rack::Attack throttle specsMichael Kozono2017-11-171-0/+286
| | | | | |
| * | | | | Add request throttlesMichael Kozono2017-11-177-3/+180
| | | | | |
| * | | | | Add throttle application settingsMichael Kozono2017-11-173-0/+56
| | | | | |
View Lorry Controller Status