summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-1515-50/+97
|\
| * Merge branch 'rc/update-flipper' into 'master'Robert Speicher2017-12-141-5/+19
| |\
| | * Update flipper to 0.11.0 and take advantage of the new featuresrc/update-flipperRémy Coutable2017-12-141-5/+19
| * | Merge branch 'dm-dedicated-sidekiq-queues' into 'master'Sean McGivern2017-12-142-19/+4
| |\ \ | | |/ | |/|
| | * Remove unused queuesdm-dedicated-sidekiq-queuesDouwe Maan2017-12-131-3/+0
| | * Use a dedicated queue for each workerDouwe Maan2017-12-122-19/+7
| * | Merge branch 'master' into 40468-empty-statesFilipa Lacerda2017-12-121-0/+2
| |\ \ | | |/
| | * Ignore temporary table in schemaMichael Kozono2017-12-111-0/+2
| * | Improve empty states for TODOs and issuesFilipa Lacerda2017-12-111-3/+3
| |/
| * Resolve "Include asset_sync gem"Ian Baum2017-12-081-0/+31
| * Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-081-0/+1
| * Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into '...Stan Hu2017-12-071-8/+1
| |\
| | * Update prometheus-client-mmap gem to highly optimized versionPawel Chojnacki2017-12-071-8/+1
| * | Support uploads for groupsJarka Kadlecova2017-12-071-0/+6
| |/
| * Merge branch 'feature/custom-text-for-new-projects' into 'master'Rémy Coutable2017-12-051-1/+1
| |\
| | * Add custom brand text on new project pagesMarkus Koller2017-12-041-1/+1
| * | Merge branch 'zj-multiple-artifacts' into 'master'Grzegorz Bizon2017-12-051-0/+2
| |\ \
| | * | Use tmp/test/artifacts for filesKamil Trzcinski2017-12-031-0/+2
| * | | Merge branch 'dm-application-worker' into 'master'Sean McGivern2017-12-052-14/+13
| |\ \ \
| | * | | Consistently schedule Sidekiq jobsdm-application-workerDouwe Maan2017-12-051-10/+9
| | * | | Add ApplicationWorker and make every worker include itDouwe Maan2017-12-051-4/+4
| | | |/ | | |/|
| * | | Merge branch '32878-merge-request-from-email' into 'master'Sean McGivern2017-12-051-1/+1
| |\ \ \
| | * | | Create merge request from emailJan Provaznik2017-12-051-1/+1
| | |/ /
| * | | Second iteration of Move Kubernetes from service to Cluster pageFilipa Lacerda2017-12-051-3/+9
| |/ /
| * | Merge branch 'gollum-initializer-warning' into 'master'Rémy Coutable2017-12-041-0/+4
| |\ \ | | |/ | |/|
| | * Add notice to gollum initializergollum-initializer-warningJacob Vosmaer2017-12-041-0/+4
| * | Merge branch 'master' into multi-file-editor-dirty-diff-indicatorPhil Hughes2017-11-301-0/+1
| |\ \ | | |/
| * | fixed web worker performancePhil Hughes2017-11-281-0/+4
* | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-309-20/+12
|\ \ \ | | |/ | |/|
| * | BE for automatic pipeline when enabling Auto DevOpsMatija Čupić2017-11-281-0/+1
| |/
| * Update svg external dependencyfl-upgrade-svgFilipa Lacerda2017-11-241-2/+2
| * Merge branch 'pawel/update_prometheus_gem_to_well_tested_version' into 'master'Douwe Maan2017-11-242-9/+8
| |\
| | * Rename wip to worker_idPawel Chojnacki2017-11-231-3/+3
| | * Move prometheus middle ware to prometheus initialized.Pawel Chojnacki2017-11-232-6/+5
| * | Allow password authentication to be disabled entirelyMarkus Koller2017-11-231-1/+1
| |/
| * Speed up Unicorn specs by using a dummy Rack application instead of GitLabNick Thomas2017-11-222-4/+0
| * Merge branch 'feature_add_mermaid' into 'master'Phil Hughes2017-11-222-4/+0
| |\
| | * Add support of MermaidVitaliy @blackst0ne Klachkov2017-11-222-4/+0
* | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-2210-4/+99
|\ \ \ | |/ /
| * | Set the default gitlab-shell timeout to 3 hoursNick Thomas2017-11-212-3/+3
| * | Batchload blobs for diff generationZeger-Jan van de Weg2017-11-211-0/+1
| * | Fix offense to the LineBreakAfterGuardClauses cop40335-master-is-broken-due-to-static-analysisRémy Coutable2017-11-201-0/+2
| * | Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-204-0/+5
| |\ \ | | |/ | |/|
| | * Adds Rubocop rule for line break after guard clauseJacopo2017-11-164-0/+5
| * | Merge branch 'mk-add-user-rate-limits' into 'master'Douwe Maan2017-11-172-1/+62
| |\ \
| | * | Don't add methods to Rack::AttackMichael Kozono2017-11-171-10/+12
| | * | Fix OAuth API and RSS rate limitingMichael Kozono2017-11-171-11/+1
| | * | Allow throttling code in test environmentMichael Kozono2017-11-171-18/+14
| | * | Add request throttlesMichael Kozono2017-11-172-1/+74
| * | | Resolve "Performance issues when loading large number of wiki pages"Francisco Javier López2017-11-171-0/+26
| |/ /