summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Map configuration to directory locations and add defaults to NFS HA doc.27685-update_ha_docsMarin Jankovski2017-02-061-9/+9
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2017-02-06545-4330/+8609
|\
| * Merge branch 'sh-add-index-for-label-count' into 'master' Yorick Peterse2017-02-052-1/+13
| |\
| | * Add index to labels for `type` and project_id`sh-add-index-for-label-countStan Hu2017-02-042-1/+13
| * | Merge branch 'slash-commands-typo' into 'master' Grzegorz Bizon2017-02-052-1/+5
| |\ \ | | |/ | |/|
| | * Fixed typoJason Aquino2017-02-042-1/+5
| * | Merge branch 'fix-rack-proxy' into 'master' Douwe Maan2017-02-041-2/+2
| |\ \ | | |/ | |/|
| | * fix rack-proxy dependency in productionfix-rack-proxyMike Greiling2017-02-041-2/+2
| * | Merge branch 'ux-guide-button-placement' into 'master' Achilleas Pipinellis2017-02-041-0/+14
| |\ \ | | |/ | |/|
| | * [ci skip] UX Guide: Button placement in groupsux-guide-button-placementAllison Whilden2017-02-031-0/+14
| * | Merge branch 'go-go-gadget-webpack' into 'master' Jacob Schatz2017-02-04204-985/+2780
| |\ \
| | * | fix failing testgo-go-gadget-webpackMike Greiling2017-02-031-1/+1
| | * | fix Vue warnings for missing elementMike Greiling2017-02-031-2/+2
| | * | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-03100-1992/+2066
| | |\ \
| | * \ \ Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-03287-2144/+3741
| | |\ \ \
| | * | | | consistently use single quotesMike Greiling2017-02-021-3/+3
| | * | | | allow application.js to require other scripts which start with application*Mike Greiling2017-02-021-1/+1
| | * | | | DRY with Gitlab.config.webpack.dev_server referenceswebpackMike Greiling2017-02-021-10/+12
| | * | | | Merge branch 'master' into webpackMike Greiling2017-02-02154-612/+1805
| | |\ \ \ \
| | * | | | | disable webpack proxy in rspec environment due to conflicts with webmock gemMike Greiling2017-02-021-12/+20
| | * | | | | remove changes to ProcfileMike Greiling2017-02-011-1/+0
| | * | | | | configure webpack dev server port via environment variableMike Greiling2017-02-011-10/+2
| | * | | | | add rack middleware to proxy webpack dev serverMike Greiling2017-02-017-0/+71
| | * | | | | remove dev-server config from development environmentMike Greiling2017-01-311-7/+0
| | * | | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-31176-850/+1829
| | |\ \ \ \ \
| | * | | | | | add CHAGELOG.md entry for webpack branchMike Greiling2017-01-291-0/+4
| | * | | | | | fix failing rspec buildMike Greiling2017-01-281-4/+4
| | * | | | | | fix test failure for merge request widgetMike Greiling2017-01-281-1/+1
| | * | | | | | fix duplicate data-toggle attributeMike Greiling2017-01-281-2/+0
| | * | | | | | update rake tasksMike Greiling2017-01-282-2/+2
| | * | | | | | fix frontend testsMike Greiling2017-01-282-10/+21
| | * | | | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-2859-135/+651
| | |\ \ \ \ \ \
| | * | | | | | | remove sprockets-es6 and execjs dependenciesMike Greiling2017-01-282-10/+0
| | * | | | | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-271135-4777/+11247
| | |\ \ \ \ \ \ \
| | * | | | | | | | Use webpack_port file if it existsPhil Hughes2017-01-192-1/+12
| | * | | | | | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-18215-710/+3716
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into go-go-gadget-webpackPhil Hughes2017-01-1759-510/+659
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-151-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-1537-1385/+1524
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | optimize gitlab ci to only run npm install onceMike Greiling2017-01-151-3/+4
| | * | | | | | | | | | | | add dependency license approvalsMike Greiling2017-01-141-10/+111
| | * | | | | | | | | | | | fix missing components in cycle_analytics_bundleMike Greiling2017-01-141-1/+1
| | * | | | | | | | | | | | fix requireAll within filtered search bundleMike Greiling2017-01-131-8/+2
| | * | | | | | | | | | | | rewrite test which relied on teaspoon quirkMike Greiling2017-01-131-2/+6
| | * | | | | | | | | | | | more post-merge fixesMike Greiling2017-01-139-26/+24
| | * | | | | | | | | | | | Added gzip compressionPhil Hughes2017-01-132-1/+6
| | * | | | | | | | | | | | add phantomJS to karma configMike Greiling2017-01-132-0/+2
| | * | | | | | | | | | | | phantomJS requires "use strict" for polyfill to properly workMike Greiling2017-01-131-1/+4
| | * | | | | | | | | | | | phantomJS doesn't allow us to spyOn history.replaceStateMike Greiling2017-01-137-14/+40
| | * | | | | | | | | | | | Merge branch 'master' into go-go-gadget-webpackPhil Hughes2017-01-13369-2171/+10065
| | |\ \ \ \ \ \ \ \ \ \ \ \