summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Toggle import description with import_sources_enabledBrianna Kicia2017-07-111-2/+3
|
* Merge branch '34729-blob' into 'master'Douwe Maan2017-07-111-1/+1
|\ | | | | | | | | | | | | snippet has a blob, but isn't a blob Closes #34729 See merge request !12792
| * snippet has a blob, but isn't a blob34729-blobSimon Knox2017-07-121-1/+1
| |
* | Merge branch '34907-dont-show-pipeline-schedule-button-for-non-member' into ↵Kamil Trzciński2017-07-111-3/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Do not show pipeline schedule button for non-member Closes #34907 See merge request !12757
| * | Do not show pipeline schedule button for non-memberTakuya Noguchi2017-07-111-3/+4
| | |
* | | 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
| * | Fixed badge alignment in new project sidebar in FireFoxsidebar-badge-fix-firefoxPhil Hughes2017-07-111-2/+2
| | |
* | | Fix welcome page action items alignmentKushal Pandya2017-07-115-92/+40
| | |
* | | Merge branch '33949-remove-healthcheck-access-token' into 'master'Sean McGivern2017-07-115-29/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove the need to use health check token by adding ability to whitelist hosts Closes #33949 See merge request !12612
| * | | Add tests for token auth.Pawel Chojnacki2017-07-061-4/+4
| | | |
| * | | Finish refactring processed configuraiton, and add test validating ip range ↵Pawel Chojnacki2017-07-051-3/+3
| | | | | | | | | | | | | | | | matching
| * | | correctly handle transforming settings into useful datastructurePawel Chojnacki2017-07-051-1/+5
| | | |
| * | | Bring back healthcheck token access to monitoring resources, but mark this ↵Pawel Chojnacki2017-07-051-2/+11
| | | | | | | | | | | | | | | | as deprecated
| * | | Remove the need to use health check tokenPawel Chojnacki2017-07-055-29/+24
| | | | | | | | | | | | | | | | | | | | in favor of whitelist that will be used to control the access to monitoring resources
* | | | Merge branch '34909-pipeline-dropdown-z-index' into 'master'Filipa Lacerda2017-07-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase z index of mini pipeline dropdown Closes #34909 See merge request !12767
| * | | | Increase z index of mini pipeline dropdown34909-pipeline-dropdown-z-indexAnnabel Dunstone Gray2017-07-101-1/+1
| | |_|/ | |/| |
* | | | Repair Regression caused by - !11573Paul Charlton2017-07-111-2/+4
| |_|/ |/| | | | | | | | | | | | | | | | | | | | some changes introduced by 4daa6da5407d235cbe4f7a787eaa29304446a870, 26b6e299e1c97b956306572c5c9f6c02f428bfd7, 17898ce021fc365c620d4600df68c3e7d2151619 were regressed during today's merge conflict resolution of !11573. This commit serves to reapply those changes. /cc: @rspeicher @stanhu @mikegreiling
* | | Support multiple Redis instances based on queue typePaul Charlton2017-07-115-11/+15
|/ /
* | Fix milestones destroy servicefix_milestone_destroy_serviceFelipe Artur2017-07-101-2/+4
| |
* | Merge branch 'sh-optimize-mr-api-emojis-and-labels' into 'master'Sean McGivern2017-07-101-33/+1
|\ \ | | | | | | | | | | | | | | | | | | Remove remaining N+1 queries in merge requests API with emojis and labels Closes #34159 See merge request !12732
| * | Remove remaining N+1 queries in merge requests API with emojis and labelsStan Hu2017-07-081-33/+1
| | | | | | | | | | | | Closes #34159
* | | Prevent bad data being added to application settings when Redis is unavailableNick Thomas2017-07-101-0/+3
| | |
* | | Merge branch 'backport-exceptions-argument' into 'master'Rémy Coutable2017-07-101-2/+4
|\ \ \ | | | | | | | | | | | | | | | | Allow passing exceptions when creating project services See merge request !12745
| * | | Allow passing exceptions when creating project servicesbackport-exceptions-argumentSean McGivern2017-07-101-2/+4
| | | |
* | | | Merge branch 'fix/offline_runner_detection' into 'master'Rémy Coutable2017-07-101-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix offline runner detection See merge request !11751
| * | | | Fix offline runner detectionAlessio Caiazza2017-07-071-3/+7
| | | | |
* | | | | Merge branch '34810-vue-pagination' into 'master'Phil Hughes2017-07-101-5/+13
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Prevent default click since we change the url manually Closes #34810 See merge request !12721
| * | | | Update tests to test what the component renders and what the clicks calls34810-vue-paginationFilipa Lacerda2017-07-071-4/+10
| | | | |
| * | | | Use vue .prevent to prevent the clickFilipa Lacerda2017-07-071-3/+1
| | | | |
| * | | | Prevent default click since we change the url manuallyFilipa Lacerda2017-07-071-0/+4
| | | | | | | | | | | | | | | | | | | | Adds tests
* | | | | 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-091-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | 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-081-0/+4
| | | | |
* | | | | Merge branch 'fix/gb/stage-id-reference-background-migration' into 'master'Grzegorz Bizon2017-07-081-2/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-07115-462/+1084
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/concerns/each_batch.rb # spec/models/concerns/each_batch_spec.rb
| * | | | | | Use new `each_batch` helper instead of custom oneGrzegorz Bizon2017-07-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In stage_id backgrond migration.
| * | | | | | Merge remote-tracking branch 'origin/active-record-each-batch' into ↵Grzegorz Bizon2017-07-0781-391/+738
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | Improve exception description in bg migrationsGrzegorz Bizon2017-07-071-1/+3
| | | | | | | |
| * | | | | | | Add description to exception in bg migrations workerGrzegorz Bizon2017-07-071-1/+1
| | | | | | | |
| * | | | | | | Use integers to schedule delayed background migrationsGrzegorz Bizon2017-07-071-2/+2
| | | | | | | |
| * | | | | | | Use ActiveRecord 5 batching to schedule bg migrationGrzegorz Bizon2017-07-071-1/+1
| | | | | | | |
| * | | | | | | Make it possible to schedule bg migrations in bulkGrzegorz Bizon2017-07-071-2/+16
| | | | | | | |
* | | | | | | | Merge branch 'sh-optimize-mr-api' into 'master'Stan Hu2017-07-081-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove many N+1 queries with merge requests API See merge request !12726
| * | | | | | | | Remove many N+1 queries with merge requests APIsh-optimize-mr-apiStan Hu2017-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Identified via `ENABLE_BULLET=1 bundle exec rspec spec/requests/api/merge_requests_spec.rb:34` Improves speed of #34159
* | | | | | | | | Merge branch 'username-password-stripped-from-import-url-fix' into 'master'Douwe Maan2017-07-071-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Username and password are no longer stripped from import url on import See merge request !12725
| * | | | | | | | | Username and password are no longer stripped from import url on importusername-password-stripped-from-import-url-fixTiago Botelho2017-07-071-0/+5
| | | | | | | | | |
* | | | | | | | | | fix milestones finder failing specissue_34852Felipe Artur2017-07-071-1/+2
| | | | | | | | | |
* | | | | | | | | | Remove double border on last group rowAnnabel Dunstone Gray2017-07-071-0/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch '2501-ce-port-update-welcome-page' into 'master'Jacob Schatz2017-07-0710-56/+180
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of updated welcome page See merge request !12662
| * | | | | | | | | Fix SVG scaling issue2501-ce-port-update-welcome-pagekushalpandya2017-07-071-3/+5
| | | | | | | | | |