summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'Kamil Trzciński2017-12-181-0/+1
|\
| * Address some comments with running a pipeline scheduleStan Hu2017-12-121-1/+1
| * Add button to run scheduled pipeline immediatelyStan Hu2017-12-121-0/+1
* | Merge branch 'no-ivar-in-modules' into 'master'Robert Speicher2017-12-153-4/+7
|\ \
| * \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-1515-50/+97
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-309-20/+12
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-2210-4/+99
| |\ \ \ \
| * | | | | Move ModuleWithInstanceVariables to Gitlab namespaceLin Jen-Shin2017-11-222-3/+3
| * | | | | Use StrongMemoize and enable/disable cops properlyLin Jen-Shin2017-11-183-7/+7
| * | | | | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-1711-51/+105
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-0627-134/+216
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-09-259-13/+70
| |\ \ \ \ \ \ \
| * | | | | | | | Allow simple ivar ||= form. Update accordinglyLin Jen-Shin2017-09-191-1/+1
| * | | | | | | | Add cop to make sure we don't use ivar in a moduleLin Jen-Shin2017-09-183-0/+3
* | | | | | | | | Merge branch 'rc/use-factory_bot_rails' into 'master'Robert Speicher2017-12-151-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_railsRémy Coutable2017-12-141-1/+1
* | | | | | | | | | Merge branch 'dm-ldap-email-readonly' into 'master'Sean McGivern2017-12-151-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make sure user email is read only when synced with LDAPDouwe Maan2017-12-151-0/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'backport-ee-3706' into 'master'Dmitriy Zaporozhets2017-12-151-0/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Add eager-load paths to autoload paths to fix Rake tasksNick Thomas2017-12-141-0/+4
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | BE for automatic pipeline when enabling Auto DevOpsMatija Čupić2017-11-281-0/+1
* | | | | | | fixed web worker performancePhil Hughes2017-11-281-0/+4
|/ / / / / /
* | | | | | 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
|\ \ \ \ \ \