summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 9.4.0-rc1v9.4.0-rc1Mike Greiling2017-07-111-1/+1
|
* Merge branch '9-4-stable-prepare-RC1' into '9-4-stable'Mike Greiling2017-07-1154-666/+935
|\ | | | | | | | | Preparing 9.4 RC1 CE-stable See merge request !12790
| * Merge branch '33949-remove-healthcheck-access-token' into 'master'9-4-stable-prepare-RC1Sean McGivern2017-07-1113-90/+228
| | | | | | | | | | | | | | Remove the need to use health check token by adding ability to whitelist hosts Closes #33949 See merge request !12612
| * Merge branch '34907-dont-show-pipeline-schedule-button-for-non-member' into ↵Kamil Trzciński2017-07-113-130/+169
| | | | | | | | | | | | | | | | | | 'master' Do not show pipeline schedule button for non-member Closes #34907 See merge request !12757
| * Merge branch 'jej/9-4-update-license-list' into 'master'Rémy Coutable2017-07-111-260/+300
| | | | | | | | | | Updated vendor/licenses.csv for 9.4 See merge request !12788
| * Merge branch 'fix/gb/qa/configure-headless-chrome-screenshots' into 'master'Rémy Coutable2017-07-111-0/+4
| | | | | | | | | | Configure headless chrome screenshots correctly See merge request !12746
| * Merge branch 'fix_milestone_destroy_service' into 'master'Mike Greiling2017-07-112-2/+55
| | | | | | | | | | Fix milestones destroy service See merge request !12762
| * Merge branch 'revert_bootsnap' into 'master'Robert Speicher2017-07-114-15/+0
| | | | | | | | | | Revert "Merge branch 'update_bootsnap_1.1.1' into 'master'" See merge request !12755
| * Merge branch 'catch-redis-address-error' into 'master'Stan Hu2017-07-112-2/+2
| | | | | | | | | | | | | | Catch redis address error Closes omnibus-gitlab#2545 See merge request !12542
| * Merge branch 'sidebar-badge-fix-firefox' into 'master'Filipa Lacerda2017-07-111-2/+2
| | | | | | | | | | Fixed badge alignment in new project sidebar in FireFox See merge request !12777
| * Merge branch 'document-gitlab-shell-disable-gems' into 'master'Stan Hu2017-07-111-0/+6
| | | | | | | | | | doc:installation add note about disable-gems for gitlab-shell See merge request !12765
| * Merge branch 'sh-fix-award-emoji-spec' into 'master'Rémy Coutable2017-07-111-2/+2
| | | | | | | | | | | | | | Fix spec/helpers/award_emoji_helper_spec.rb by using `iid` instead of `id` Closes gitlab-ee#2890 See merge request !12770
| * Merge branch 'sh-disabled-prepared-statements-in-test' into 'master'Yorick Peterse2017-07-112-0/+2
| | | | | | | | | | Disabled prepared statements in test See merge request !12773
| * Merge branch '34933-fix-welcome-page-actions-alignment' into 'master'Phil Hughes2017-07-115-92/+40
| | | | | | | | | | | | | | Fix welcome page action items alignment Closes #34933 See merge request !12778
| * Merge branch 'fix-n-plus-one-in-url-builder' into 'master'Rémy Coutable2017-07-112-5/+7
| | | | | | | | | | | | | | Don't reload ActiveRecord objects when building note URLs Closes #34882 See merge request !12780
| * Merge branch 'fix/gb/qa/fix-test-scenario-for-adding-a-project' into 'master'Rémy Coutable2017-07-114-19/+8
| | | | | | | | | | | | | | Fix QA test scenario for creating a new project Closes gitlab-qa#56 See merge request !12747
| * Merge branch 'backport-exceptions-argument' into 'master'Rémy Coutable2017-07-111-2/+4
| | | | | | | | | | Allow passing exceptions when creating project services See merge request !12745
| * Merge branch 'fix/offline_runner_detection' into 'master'Rémy Coutable2017-07-112-3/+11
| | | | | | | | | | Fix offline runner detection See merge request !11751
| * Merge branch '34728-fix-application-setting-created-when-redis-down' into ↵Stan Hu2017-07-115-8/+35
| | | | | | | | | | | | | | | | | | 'master' Prevent bad data being added to application settings when Redis is unavailable Closes #34728 See merge request !12750
| * Merge branch 'jej/9-4-update-gitignore-and-license-templates' into 'master'Rémy Coutable2017-07-114-20/+25
| | | | | | | | | | Update CI templates for 9.4 See merge request !12784
| * Merge branch 'jej/update-source-install-instructions-for-9-4' into 'master'Achilleas Pipinellis2017-07-111-2/+2
| | | | | | | | | | Update source installation instructions for 9.4 See merge request !12779
| * Merge branch 'jej/create-update-instructions-for-9-4' into 'master'Achilleas Pipinellis2017-07-111-12/+33
|/ | | | | Update 9.4 update instructions to include changes made to 9.3 instructions See merge request !12781
* Merge branch 'rs-sign_in' into 'master'Douwe Maan2017-07-09280-413/+398
|\ | | | | | | | | Change gitlab_sign_in to sign_in See merge request !12369
| * Change `sign_out` usage to `gitlab_sign_out` in one specRobert Speicher2017-07-071-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_inRobert Speicher2017-07-07111-294/+2132
| |\
| * \ Merge branch 'master' into rs-sign_inRobert Speicher2017-07-07266-1119/+3642
| |\ \
| * \ \ Merge branch 'master' into rs-sign_inRobert Speicher2017-07-06906-5137/+11025
| |\ \ \
| * | | | Auto-correct ProjectPathHelper violationsRobert Speicher2017-07-06224-893/+810
| | | | |
| * | | | Add ProjectPathHelper copDouwe Maan2017-07-063-0/+93
| | | | |
| * | | | Remove instance variable assignment from `gitlab_sign_in` helperrs-sign_inRobert Speicher2017-06-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Also removes `Thread.current[:current_user]` assignment from `gitlab_sign_in_via`
| * | | | Change gitlab_sign_out to sign_out where possibleRobert Speicher2017-06-291-3/+3
| | | | |
| * | | | Remove gitlab_sign_out_direct helperRobert Speicher2017-06-292-7/+2
| | | | |
| * | | | Remove a duplicated test block from the result of a conflict resolutionRobert Speicher2017-06-291-26/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This was mistakenly added in 17196a2ff31 and is identical to the group above it.
| * | | | Change gitlab_sign_in to sign_in where possibleRobert Speicher2017-06-29284-371/+392
| | | | |
* | | | | Merge branch 'dm-routing-helpers-fix' into 'master'31331-view-time-tracking-info-in-issue-board-contextual-sidebar29974-real-time-emoji-award-updatesMarin Jankovski2017-07-092-4/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also inject new route helpers into includers of GitlabRoutingHelper Closes #34859 See merge request !12735
| * | | | | Also inject new route helpers into includers of GitlabRoutingHelperdm-routing-helpers-fixDouwe Maan2017-07-082-4/+13
| | |_|_|/ | |/| | |
* | | | | Merge branch 'fix/gb/stage-id-reference-background-migration' into 'master'Grzegorz Bizon2017-07-087-7/+189
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Bizon2017-07-07235-873/+3376
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/concerns/each_batch.rb # spec/models/concerns/each_batch_spec.rb
| * | | | | | Simplify stage_id migration as we now use relationsGrzegorz Bizon2017-07-071-9/+4
| | | | | | |
| * | | | | | Do not schedule bg migration when it is not neededGrzegorz Bizon2017-07-072-3/+2
| | | | | | |
| * | | | | | Schedule stage_id bg migrations in batches of 10Grzegorz Bizon2017-07-073-8/+13
| | | | | | |
| * | | | | | Use new `each_batch` helper instead of custom oneGrzegorz Bizon2017-07-073-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In stage_id backgrond migration.
| * | | | | | Merge remote-tracking branch 'origin/active-record-each-batch' into ↵Grzegorz Bizon2017-07-07172-753/+2454
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 batchesYorick Peterse2017-07-078-1/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 helpersGrzegorz Bizon2017-07-072-172/+30
| | | | | | | |
| * | | | | | | Add some comments on new migrations helpersGrzegorz Bizon2017-07-071-0/+38
| | | | | | | |
| * | | | | | | Schedule stage_id background migration in rangesGrzegorz Bizon2017-07-074-19/+22
| | | | | | | |
| * | | | | | | Extract `execute_in_batches` migrations helperGrzegorz Bizon2017-07-072-22/+60
| | | | | | | |
| * | | | | | | Add walk_table_in_batches and refactor migration helpersGrzegorz Bizon2017-07-072-31/+97
| | | | | | | |
| * | | | | | | Reduce a delay between stage_id scheduled migrationsGrzegorz Bizon2017-07-072-5/+5
| | | | | | | |
View Lorry Controller Status