summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'short-circuit-coverage-with-empty-regex' into 'master'Grzegorz Bizon2017-07-242-2/+7
| | | | | Short-circuit build coverage extraction for empty regexes See merge request !13015
* Merge branch 'fix-old-ci-api' into 'master'Grzegorz Bizon2017-07-241-1/+1
| | | | | | | Fix support for old CI API when image or services are not specified Closes #35421 See merge request !13023
* Merge branch '35368-fix-gcovr-regexp-matching' into 'master'Grzegorz Bizon2017-07-241-0/+1
| | | | | | | Fix the gcovr coverage regex by removing line separators before scanning Closes #35368 See merge request !13025
* Revert "Merge branch 'bjk/metric_names' into 'master'"9-4-stable-prepare-rc6James Edwards-Jones2017-07-214-44/+49
| | | | This reverts commit b639ed9f07174c06424586a08db0ed0cde654e54.
* Merge branch 'bjk/metric_names' into 'master'Douwe Maan2017-07-204-49/+44
| | | | | | | | Update metric names to match Prometheus guidelines. Closes #35031 See merge request !12812
* Merge branch 'htve/gitlab-ce-34880_add_ukrainian_translations_to_i18n'Rémy Coutable2017-07-201-0/+1
| | | | | | See merge request !12744. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch '34789_add_japanese_translations_to_i18n' into 'master'Rémy Coutable2017-07-201-1/+2
| | | | | | | | Add Japanese Translation to i18n Closes #34789 See merge request !12693
* Merge branch 'bvl-free-system-namespace' into 'master'Sean McGivern2017-07-202-1/+26
| | | | | | | | Free `system` namespace by moving uploads into `uploads/-` Closes #33550 See merge request !12917
* Merge branch 'perf/policy-class-cache' into 'master'Sean McGivern2017-07-203-17/+51
| | | | | Perf: Improve performance of basic ruby ops in DeclarativePolicy See merge request !12922
* Merge branch 'fix/gb/fix-container-registry-tag-routing' into 'master'Kamil Trzciński2017-07-201-5/+11
| | | | | | | Fix docker tag reference routing constraints Closes #35220 and gitlab-com/support-forum#2246 See merge request !12961
* Merge branch '34881_add_russian_translations_to_i18n' into 'master'Rémy Coutable2017-07-201-0/+1
| | | | | | | Add Russian Translations To I18N Closes #34881 See merge request !12743
* Merge branch 'pawel/update_prometheus' into 'master'Rémy Coutable2017-07-201-3/+5
| | | | | Update Prometheus gem to version that explicitly calls `munmap` See merge request !12955
* Merge branch 'fix-performance-bar-cached-user-ids' into 'master'Sean McGivern2017-07-201-2/+3
| | | | | Expire cached user IDs that can see the performance after 5 minutes See merge request !12911
* Merge branch '35252-fix-performance-bar-queries-duration-sorting' into 'master'Robert Speicher2017-07-201-1/+1
| | | | | | | Fix queries duration sorting in Performance Bar Closes #35252 See merge request !12947
* Merge branch ↵Sean McGivern2017-07-201-1/+8
| | | | | | | | | '34940-peek-performance-bar-doesn-t-count-cached-queries-but-shows-them' into 'master' Resolve "Peek performance bar doesn't count cached queries, but shows them" Closes #34940 See merge request !12915
* Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'Sean McGivern2017-07-201-7/+22
| | | | | Fix an infinite loop in Gitlab:UntrustedRegexp See merge request !2146
* Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'Douwe Maan2017-07-193-4/+61
| | | | | | 24570 use re2 for user supplied regexp 9 3 See merge request !2129
* Merge branch 'sh-add-simple-mode-mr-api-9-4-stable' into ↵James Edwards-Jones2017-07-143-6/+82
|\ | | | | | | | | | | | | '9-4-stable-preparing-rc3' Cherry pick performance improvements and simple merge request API changes to 9-4-stable See merge request !12799
| * Merge branch 'sh-add-mr-simple-mode' into 'master'sh-add-simple-mode-mr-api-9-4-stableSean McGivern2017-07-112-5/+27
| | | | | | | | | | | | | | Add a simple mode to merge request API Closes #34920 See merge request !12766
| * Merge branch 'sh-improve-mr-api' into 'master'Sean McGivern2017-07-111-4/+4
| | | | | | | | | | Paginate the merge requests API earlier to avoid eager loading every merge request See merge request !12764
| * Merge branch 'sh-optimize-mr-api-emojis-and-labels' into 'master'Sean McGivern2017-07-113-5/+59
| | | | | | | | | | | | | | Remove remaining N+1 queries in merge requests API with emojis and labels Closes #34159 See merge request !12732
* | Merge branch 'sh-fix-nil-broadcast-message' into 'master'Sean McGivern2017-07-141-1/+1
| | | | | | | | | | | | | | Handle case when BroadcastMessage.current is nil Closes #35094 See merge request !12860
* | Merge branch '34325-reinstate-is_admin-for-user-api' into 'master'Sean McGivern2017-07-141-1/+10
| | | | | | | | | | | | | | Return `is_admin` attribute in the GET /user endpoint for admins Closes #34325 See merge request !12811
* | Merge branch 'catch-redis-address-error' into 'master'Stan Hu2017-07-111-1/+1
| | | | | | | | | | | | | | Catch redis address error Closes omnibus-gitlab#2545 See merge request !12542
* | Merge branch 'fix-n-plus-one-in-url-builder' into 'master'Rémy Coutable2017-07-111-5/+3
| | | | | | | | | | | | | | Don't reload ActiveRecord objects when building note URLs Closes #34882 See merge request !12780
* | Merge branch '34728-fix-application-setting-created-when-redis-down' into ↵Stan Hu2017-07-111-6/+1
|/ | | | | | | | | 'master' Prevent bad data being added to application settings when Redis is unavailable Closes #34728 See merge request !12750
* 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-4/+9
|\ | | | | | | | | | | | | 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-4/+9
| |
* | Merge branch 'fix/gb/stage-id-reference-background-migration' into 'master'Grzegorz Bizon2017-07-081-0/+19
|\ \ | | | | | | | | | | | | | | | | | | 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-0710-36/+108
| |\ \ | | | | | | | | | | | | | | | | # 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
| | | |
| * | | Schedule stage_id bg migrations in batches of 10Grzegorz Bizon2017-07-071-1/+1
| | | |
| * | | Merge remote-tracking branch 'origin/active-record-each-batch' into ↵Grzegorz Bizon2017-07-0716-105/+223
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-94/+26
| | | | |
| * | | | Add some comments on new migrations helpersGrzegorz Bizon2017-07-071-0/+38
| | | | |
| * | | | Schedule stage_id background migration in rangesGrzegorz Bizon2017-07-072-4/+9
| | | | |
| * | | | Extract `execute_in_batches` migrations helperGrzegorz Bizon2017-07-071-15/+24
| | | | |
| * | | | Add walk_table_in_batches and refactor migration helpersGrzegorz Bizon2017-07-071-27/+48
| | | | |
| * | | | Sanitize id value passed to async background migrationGrzegorz Bizon2017-07-071-3/+1
| | | | |
| * | | | Improve readability of build stage id migration queryGrzegorz Bizon2017-07-071-6/+7
| | | | |
| * | | | Test if argument passed to a migration is presentGrzegorz Bizon2017-07-071-1/+1
| | | | |
| * | | | Add initial build stage_id ref background migrationGrzegorz Bizon2017-07-071-7/+11
| | | | |
| * | | | Add initial stage_id background migration filesGrzegorz Bizon2017-07-071-0/+16
| | | | |
* | | | | Merge branch 'sh-optimize-mr-api' into 'master'Stan Hu2017-07-081-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Identified via `ENABLE_BULLET=1 bundle exec rspec spec/requests/api/merge_requests_spec.rb:34` Improves speed of #34159
* | | | | Merge branch 'gitaly-internal-allowed-send-repo' into 'master'Robert Speicher2017-07-082-7/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Send Gitaly Repository with /api/internal/allowed See merge request !12452
| * | | | | Send Gitaly Repository with /api/internal/allowedgitaly-internal-allowed-send-repoKim "BKC" Carlbäcker2017-07-072-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make single gitaly payload - Add feature-flag specs to verify payload
* | | | | | Merge branch 'feature/user-datetime-search-api-mysql' into 'master'Douwe Maan2017-07-071-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add creation time filters to user search API for admins Closes #29507 See merge request !12682
| * | | | | refactor created at filter to use model scopesJames Lopez2017-07-071-17/+0
| | | | | |
View Lorry Controller Status