summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'disable-webpack-optimization' into 'master'Tim Zallmann2017-08-231-0/+1
|\
| * disable webpack.optimize.ModuleConcatenationPlugin during karma testsdisable-webpack-optimizationMike Greiling2017-08-211-0/+1
* | Merge branch 'zj-fix-import-gitlab-export-form' into 'master'Douwe Maan2017-08-221-3/+1
|\ \
| * | Update form to properly set the pathZeger-Jan van de Weg2017-08-221-3/+1
* | | Merge branch 'zj-remove-ci-api-v1' into 'master'Kamil Trzciński2017-08-211-4/+0
|\ \ \ | |/ / |/| |
| * | Remove CI API v1Zeger-Jan van de Weg2017-08-181-4/+0
* | | Merge branch 'fix-broken-yarn-deps' into 'master'Tim Zallmann2017-08-211-7/+2
|\ \ \
| * | | remove zopfli compression temporarily until a better solution is foundMike Greiling2017-08-181-7/+2
| |/ /
* | | remove superfluous users bundleremove-user-bundleMike Greiling2017-08-181-1/+0
| |/ |/|
* | Setup repositories settings properlymk-setup-settings-properlyMichael Kozono2017-08-171-1/+5
* | Setup LDAP settings properlyMichael Kozono2017-08-171-0/+4
|/
* Merge branch 'dm-gpg-signature-performance' into 'master'Robert Speicher2017-08-161-0/+20
|\
| * Only create commit GPG signature when necessarydm-gpg-signature-performanceDouwe Maan2017-08-161-0/+20
* | Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master'Rémy Coutable2017-08-162-2/+5
|\ \
| * | Use better higher threshold settings for storage access in testsBob Van Landuyt2017-08-161-0/+3
| * | Allow a `failure_wait_time` of 0 for storage accessBob Van Landuyt2017-08-161-2/+2
* | | Merge branch 'rs-more-public-send-whitelists' into 'master'Rémy Coutable2017-08-161-0/+2
|\ \ \
| * | | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-141-0/+2
* | | | Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable2017-08-164-8/+8
|\ \ \ \
| * | | | Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-154-8/+8
* | | | | Merge branch '36405-fix-mysql-timestamp-columns' into 'master'Stan Hu2017-08-151-0/+30
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Make sure MySQL would not use CURRENT_TIMESTAMP36405-fix-mysql-timestamp-columnsLin Jen-Shin2017-08-151-0/+30
| | |_|/ | |/| |
* | | | Merge branch '36152-enable-scope-hoisting-with-webpack' into 'master'Jacob Schatz2017-08-151-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | enable webpack scope hoistingMike Greiling2017-08-151-0/+3
| | |/ | |/|
* | | Improve Prometheus docs, include nginx ingressJoshua Lambert2017-08-141-4/+34
| |/ |/|
* | Make sure uploads for personal snippets are correctly renderedBob Van Landuyt2017-08-111-2/+2
|/
* alternative route for download archivehaseeb2017-08-101-0/+3
* Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-091-1/+1
* Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-082-3/+3
* Merge branch 'master' into ideMike Greiling2017-08-077-7/+47
|\
| * Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-081-0/+4
| |\
| | * Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-0/+4
| * | Merge branch '32844-issuables-performance' into 'master'Sean McGivern2017-08-071-0/+2
| |\ \
| | * | Move some after_create parts to worker to improve performance32844-issuables-performanceJarka Kadlecova2017-08-071-0/+2
| * | | Merge branch '33902-upgrade-to-webpack-v3' into 'master'Jacob Schatz2017-08-072-7/+20
| |\ \ \
| | * | | add thunky to approved licenses (MIT)Mike Greiling2017-08-071-0/+6
| | * | | add disableHostCheck to devServer config since webpack dev server is proxiedMike Greiling2017-08-071-0/+1
| | * | | replace stats-webpack-plugin with webpack-stats-pluginMike Greiling2017-08-071-7/+13
| * | | | Merge branch 'zj-project-templates' into 'master'Sean McGivern2017-08-071-0/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-0718-40/+178
| | |\ \ \ \ | | | |/ / /
| * | | | | Merge branch 'group-milestone-references-system-notes' into 'master'Robert Speicher2017-08-071-0/+4
| |\ \ \ \ \
| | * | | | | Support references to group milestonesSean McGivern2017-08-071-0/+4
| | | |/ / / | | |/| | |
| * | | | | Add sidekiq metrics endpoint and add http server to sidekiqPaweł Chojnacki2017-08-073-0/+16
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into ideMike Greiling2017-08-077-5/+46
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' into 'bvl-nfs-circuitbreaker'Douwe Maan2017-08-072-3/+6
| |\ \ \ \ | | |/ / /
| | * | | Fix issues with pdf-js dependenciesMike Greiling2017-08-071-1/+4
| | * | | Backport to CE for:2902-standalone-ee-dir-ceLin Jen-Shin2017-08-041-2/+2
| * | | | Move hostname to Gitlab::EnvironmentBob Van Landuyt2017-08-041-1/+0
| * | | | Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-044-1/+40
| |/ / /
| * | | fix #3686 make tarball download url to end with extensionhaseeb2017-08-031-1/+1