summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-104-4/+7
|\
| * 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 issue-discussions-refactorFilipa Lacerda2017-08-089-9/+119
|\ \ | |/
| * 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
| | |\ \ \ \ | | | |/ / /
| | * | | | Move hostname to Gitlab::EnvironmentBob Van Landuyt2017-08-041-1/+0
| | * | | | Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-044-1/+40
| * | | | | Merge branch 'master' into ideDouwe Maan2017-08-032-1/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-312-2/+5
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-2818-38/+188
| |\ \ \ \ \ \
| * | | | | | | Add define and require to window in vs transformLuke "Jared" Bennett2017-07-211-0/+1
| * | | | | | | ignore case for worker exclusionLuke "Jared" Bennett2017-07-211-1/+1
| * | | | | | | Remove all vs workers from transformLuke "Jared" Bennett2017-07-211-1/+1
| * | | | | | | exempt webworker script from copy closure transformLuke "Jared" Bennett2017-07-201-1/+1
| * | | | | | | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-2035-112/+703
| |\ \ \ \ \ \ \
| * | | | | | | | fix redundant vue libraryMike Greiling2017-07-181-1/+2
| * | | | | | | | fix global context and relative_url_root for monaco editorMike Greiling2017-07-181-4/+25
| * | | | | | | | Remove multiple methods of including monaco related code and remove static mo...Luke "Jared" Bennett2017-07-181-0/+8
| * | | | | | | | Merge branch 'dm-tree-json' into ide Resolving conflicts.Jacob Schatz2017-06-239-28/+290
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add monaco editor.Jacob Schatz2017-06-151-0/+1
* | | | | | | | | | Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-071-1/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Fix issues with pdf-js dependenciesMike Greiling2017-08-071-1/+4
* | | | | | | | | | Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-042-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Backport to CE for:2902-standalone-ee-dir-ceLin Jen-Shin2017-08-041-2/+2
| | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | fix #3686 make tarball download url to end with extensionhaseeb2017-08-031-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-012-2/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Inline script cleanup globals and easyTim Zallmann2017-08-011-0/+5
| * | | | | | | Fix LDAP documentation and example configmk-fix-ldap-ca-file-docsMichael Kozono2017-07-311-1/+1
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'inline-js-removal-projects-other' into 'master'Phil Hughes2017-07-311-1/+4
| |\ \ \ \ \ \
| | * | | | | | Converted Pipelines ChartsTim Zallmann2017-07-271-0/+1
| | * | | | | | Moved Inline JS for Pipelines Charts + new Pipeline to dispatcherTim Zallmann2017-07-271-1/+2
| | * | | | | | Project New moved to external FileTim Zallmann2017-07-271-0/+1
* | | | | | | | Merge branch 'master' into issue-discussions-refactorDouwe Maan2017-07-3118-37/+187
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Ensure Gitlab::Application.routes.default_url_options are set correctly in Ca...Rémy Coutable2017-07-281-1/+1
| | |_|_|_|/ / | |/| | | | |