Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs-sign_in' into 'master' | Douwe Maan | 2017-07-09 | 280 | -413/+398 |
|\ | | | | | | | | | Change gitlab_sign_in to sign_in See merge request !12369 | ||||
| * | Change `sign_out` usage to `gitlab_sign_out` in one spec | Robert Speicher | 2017-07-07 | 1 | -2/+2 |
| | | | | | | | | | | | | For reasons that are still unclear, the EE version (but only the EE version) of this spec was failing reliably, and changing these calls seemed to resolve it. So we're making the change here for parity. | ||||
| * | Merge branch 'master' into rs-sign_in | Robert Speicher | 2017-07-07 | 24 | -57/+954 |
| |\ | |||||
| * \ | Merge branch 'master' into rs-sign_in | Robert Speicher | 2017-07-07 | 70 | -316/+1829 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into rs-sign_in | Robert Speicher | 2017-07-06 | 182 | -977/+2753 |
| |\ \ \ | |||||
| * | | | | Auto-correct ProjectPathHelper violations | Robert Speicher | 2017-07-06 | 224 | -893/+810 |
| | | | | | |||||
| * | | | | Add ProjectPathHelper cop | Douwe Maan | 2017-07-06 | 1 | -0/+41 |
| | | | | | |||||
| * | | | | Remove instance variable assignment from `gitlab_sign_in` helperrs-sign_in | Robert Speicher | 2017-06-29 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Also removes `Thread.current[:current_user]` assignment from `gitlab_sign_in_via` | ||||
| * | | | | Change gitlab_sign_out to sign_out where possible | Robert Speicher | 2017-06-29 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Remove gitlab_sign_out_direct helper | Robert Speicher | 2017-06-29 | 2 | -7/+2 |
| | | | | | |||||
| * | | | | Remove a duplicated test block from the result of a conflict resolution | Robert Speicher | 2017-06-29 | 1 | -26/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This was mistakenly added in 17196a2ff31 and is identical to the group above it. | ||||
| * | | | | Change gitlab_sign_in to sign_in where possible | Robert Speicher | 2017-06-29 | 284 | -371/+392 |
| | | | | | |||||
* | | | | | Merge branch 'fix/gb/stage-id-reference-background-migration' into 'master' | Grzegorz Bizon | 2017-07-08 | 3 | -1/+106 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add build stage_id reference background migration Closes #34151 See merge request !12513 | ||||
| * \ \ \ \ | Merge branch 'master' into 'fix/gb/stage-id-reference-background-migration' | Grzegorz Bizon | 2017-07-07 | 66 | -289/+1782 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/concerns/each_batch.rb # spec/models/concerns/each_batch_spec.rb | ||||
| * | | | | | | Do not schedule bg migration when it is not needed | Grzegorz Bizon | 2017-07-07 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | Schedule stage_id bg migrations in batches of 10 | Grzegorz Bizon | 2017-07-07 | 1 | -4/+6 |
| | | | | | | | |||||
| * | | | | | | Use new `each_batch` helper instead of custom one | Grzegorz Bizon | 2017-07-07 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | In stage_id backgrond migration. | ||||
| * | | | | | | Merge remote-tracking branch 'origin/active-record-each-batch' into ↵ | Grzegorz Bizon | 2017-07-07 | 36 | -199/+697 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/gb/stage-id-reference-background-migration * origin/active-record-each-batch: (59 commits) Added EachBatch for iterating tables in batches Extend MR tabs a bit to cover up the avatar holder and collapse icon on scroll Update VERSION to 9.4.0-pre. Add CHANGELOG Fix some N+1 queries in the GET /projects API Don't show auxiliary blob viewer for README when there is no wiki Improve & fix the performance bar UI and behavior Remove orphaned haml files Fixed CHANGELOG.md for 9.3.4 release Add table for merge request commits 34727 Remove two columned layout from project member settings Just draw :legacy_builds Re-enable polling for environments Cleanup minor UX issues in the performance dashboard Upgrade GitLab Workhorse to v2.3.0 Added test for the chart legend Use correct field for label name, fix default for unit to be blank Fix shorter route helpers in production environment Encode certificate-authority-data in base64 Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'" ... | ||||
| | * | | | | | | Added EachBatch for iterating tables in batches | Yorick Peterse | 2017-07-07 | 2 | -0/+66 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module provides a class method called `each_batch` that can be used to iterate tables in batches in a more efficient way compared to Rails' `in_batches` method. This commit also includes a RuboCop cop to blacklist the use of `in_batches` in favour of this new method. | ||||
| * | | | | | | | Revert recent changes in migration helpers | Grzegorz Bizon | 2017-07-07 | 1 | -78/+4 |
| | | | | | | | | |||||
| * | | | | | | | Schedule stage_id background migration in ranges | Grzegorz Bizon | 2017-07-07 | 1 | -6/+5 |
| | | | | | | | | |||||
| * | | | | | | | Extract `execute_in_batches` migrations helper | Grzegorz Bizon | 2017-07-07 | 1 | -7/+36 |
| | | | | | | | | |||||
| * | | | | | | | Add walk_table_in_batches and refactor migration helpers | Grzegorz Bizon | 2017-07-07 | 1 | -4/+49 |
| | | | | | | | | |||||
| * | | | | | | | Reduce a delay between stage_id scheduled migrations | Grzegorz Bizon | 2017-07-07 | 1 | -4/+4 |
| | | | | | | | | |||||
| * | | | | | | | Do not compare float with integer in migrations specs | Grzegorz Bizon | 2017-07-07 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Improve readability of build stage id migration query | Grzegorz Bizon | 2017-07-07 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Use integers to schedule delayed background migrations | Grzegorz Bizon | 2017-07-07 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Make `inline` a default sidekiq testing processing again | Grzegorz Bizon | 2017-07-07 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Improve specs for background stage_id ref migration | Grzegorz Bizon | 2017-07-07 | 1 | -6/+13 |
| | | | | | | | | |||||
| * | | | | | | | Remove unused background migrations matcher | Grzegorz Bizon | 2017-07-07 | 1 | -12/+0 |
| | | | | | | | | |||||
| * | | | | | | | Use ActiveRecord 5 batching to schedule bg migration | Grzegorz Bizon | 2017-07-07 | 1 | -29/+26 |
| | | | | | | | | |||||
| * | | | | | | | Make it possible to schedule bg migrations in bulk | Grzegorz Bizon | 2017-07-07 | 2 | -2/+39 |
| | | | | | | | | |||||
| * | | | | | | | Add specs for delayed stage_id background migrations | Grzegorz Bizon | 2017-07-07 | 1 | -4/+47 |
| | | | | | | | | |||||
| * | | | | | | | Find builds that require a migration in batches | Grzegorz Bizon | 2017-07-07 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Add initial build stage_id ref background migration | Grzegorz Bizon | 2017-07-07 | 1 | -0/+5 |
| | | | | | | | | |||||
| * | | | | | | | Add initial stage_id background migration files | Grzegorz Bizon | 2017-07-07 | 1 | -0/+26 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'gitaly-internal-allowed-send-repo' into 'master' | Robert Speicher | 2017-07-08 | 1 | -14/+60 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send Gitaly Repository with /api/internal/allowed See merge request !12452 | ||||
| * | | | | | | | | Send Gitaly Repository with /api/internal/allowedgitaly-internal-allowed-send-repo | Kim "BKC" Carlbäcker | 2017-07-07 | 1 | -14/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make single gitaly payload - Add feature-flag specs to verify payload | ||||
* | | | | | | | | | Merge branch 'feature/user-datetime-search-api-mysql' into 'master' | Douwe Maan | 2017-07-07 | 2 | -0/+40 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add creation time filters to user search API for admins Closes #29507 See merge request !12682 | ||||
| * | | | | | | | | fix specs | James Lopez | 2017-07-07 | 1 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | refactor filters | James Lopez | 2017-07-07 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | improve finder spec | James Lopez | 2017-07-07 | 1 | -1/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | add created at filter logic to users finder and API | James Lopez | 2017-07-07 | 1 | -1/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | add finder and users API spec | James Lopez | 2017-07-07 | 2 | -0/+35 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '30281-report-abusive-content-from-an-issue-or-merge-request' ↵ | Jacob Schatz | 2017-07-07 | 5 | -21/+465 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Report abusive content from an issue or merge request" Closes #30281 See merge request !11786 | ||||
| * | | | | | | | | | Fix MR and issue specs | Luke "Jared" Bennett | 2017-07-07 | 1 | -8/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix close_reopen_report_toggle_spec.rb path helpers rubocop offense | Luke "Jared" Bennett | 2017-07-07 | 1 | -4/+4 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Added issuables_helper.js, tidied up droplab-dropdown JS, fixed filtered ↵ | Luke "Jared" Bennett | 2017-07-07 | 2 | -33/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | search specs | ||||
| * | | | | | | | | | Fixed issue_spec and merge_request_spec for report toggle changes | Luke "Jared" Bennett | 2017-07-07 | 2 | -22/+18 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fixed MR single button submit failure and attempted to tidy up close_reopen ↵ | Luke "Jared" Bennett | 2017-07-07 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | partials using issuable_helpers and setDisable will use true as default bool |