summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'bjk/metric_names' into 'master'"9-4-stable-prepare-rc6James Edwards-Jones2017-07-214-44/+49
* Merge branch 'bjk/metric_names' into 'master'Douwe Maan2017-07-204-49/+44
* Merge branch 'htve/gitlab-ce-34880_add_ukrainian_translations_to_i18n'Rémy Coutable2017-07-201-0/+1
* Merge branch '34789_add_japanese_translations_to_i18n' into 'master'Rémy Coutable2017-07-201-1/+2
* Merge branch 'bvl-free-system-namespace' into 'master'Sean McGivern2017-07-202-1/+26
* Merge branch 'perf/policy-class-cache' into 'master'Sean McGivern2017-07-203-17/+51
* Merge branch 'fix/gb/fix-container-registry-tag-routing' into 'master'Kamil Trzciński2017-07-201-5/+11
* Merge branch '34881_add_russian_translations_to_i18n' into 'master'Rémy Coutable2017-07-201-0/+1
* Merge branch 'pawel/update_prometheus' into 'master'Rémy Coutable2017-07-201-3/+5
* Merge branch 'fix-performance-bar-cached-user-ids' into 'master'Sean McGivern2017-07-201-2/+3
* Merge branch '35252-fix-performance-bar-queries-duration-sorting' into 'master'Robert Speicher2017-07-201-1/+1
* Merge branch '34940-peek-performance-bar-doesn-t-count-cached-queries-but-sho...Sean McGivern2017-07-201-1/+8
* Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'Sean McGivern2017-07-201-7/+22
* Merge branch '24570-use-re2-for-user-supplied-regexp-9-3' into 'security-9-3'Douwe Maan2017-07-193-4/+61
* Merge branch 'sh-add-simple-mode-mr-api-9-4-stable' into '9-4-stable-preparin...James Edwards-Jones2017-07-143-6/+82
|\
| * Merge branch 'sh-add-mr-simple-mode' into 'master'sh-add-simple-mode-mr-api-9-4-stableSean McGivern2017-07-112-5/+27
| * Merge branch 'sh-improve-mr-api' into 'master'Sean McGivern2017-07-111-4/+4
| * Merge branch 'sh-optimize-mr-api-emojis-and-labels' into 'master'Sean McGivern2017-07-113-5/+59
* | Merge branch 'sh-fix-nil-broadcast-message' into 'master'Sean McGivern2017-07-141-1/+1
* | Merge branch '34325-reinstate-is_admin-for-user-api' into 'master'Sean McGivern2017-07-141-1/+10
* | Merge branch 'catch-redis-address-error' into 'master'Stan Hu2017-07-111-1/+1
* | Merge branch 'fix-n-plus-one-in-url-builder' into 'master'Rémy Coutable2017-07-111-5/+3
* | Merge branch '34728-fix-application-setting-created-when-redis-down' into 'ma...Stan Hu2017-07-111-6/+1
|/
* 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 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
|\ \
| * \ Merge branch 'master' into 'fix/gb/stage-id-reference-background-migration'Grzegorz Bizon2017-07-0710-36/+108
| |\ \
| * | | 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 fix/gb/st...Grzegorz Bizon2017-07-0716-105/+223
| |\ \ \
| | * | | Added EachBatch for iterating tables in batchesYorick Peterse2017-07-071-1/+1
| * | | | 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 APIsh-optimize-mr-apiStan Hu2017-07-071-1/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'gitaly-internal-allowed-send-repo' into 'master'Robert Speicher2017-07-082-7/+31
|\ \ \ \ \
| * | | | | Send Gitaly Repository with /api/internal/allowedgitaly-internal-allowed-send-repoKim "BKC" Carlbäcker2017-07-072-7/+31
* | | | | | Merge branch 'feature/user-datetime-search-api-mysql' into 'master'Douwe Maan2017-07-071-0/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | refactor created at filter to use model scopesJames Lopez2017-07-071-17/+0
| * | | | | fix specsJames Lopez2017-07-071-1/+1
| * | | | | refactor filtersJames Lopez2017-07-071-0/+17
| * | | | | add created at filter logic to users finder and APIJames Lopez2017-07-071-0/+6
| | |_|/ / | |/| | |
View Lorry Controller Status