summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ensure karma fails if it cannot load all spec filesfix-ignored-spec-failuresMike Greiling2017-02-071-2/+6
* Merge branch 'babel-all-the-things' into 'master' Fatih Acet2017-02-063-4/+11
|\
| * add CHANGELOG entry for !8988babel-all-the-thingsMike Greiling2017-02-061-0/+5
| * transpile all javascript files with babelMike Greiling2017-02-061-2/+2
| * add npm run webpack commandMike Greiling2017-02-061-2/+4
* | Merge branch 'fix-ace-editor-modules' into 'master' Fatih Acet2017-02-061-8/+17
|\ \
| * | lazy-load ace config so that we can ensure window.gon existsfix-ace-editor-modulesMike Greiling2017-02-051-10/+17
| * | fix ace editor modules to include asset digest in productionMike Greiling2017-02-051-2/+4
| |/
* | Merge branch 'terminal-max-session-time' into 'master' Kamil Trzciński2017-02-0616-13/+107
|\ \
| * | Introduce maximum session time for terminal websocket connectionterminal-max-session-timeAdam Niedzielski2017-02-0616-13/+107
| |/
* | Merge branch '22007-unify-projects-search' into 'master' Rémy Coutable2017-02-069-65/+1910
|\ \
| * | Adjust V3 projects typo on spec22007-unify-projects-searchOswaldo Ferreira2017-02-031-1/+1
| * | Update V3 to V4 docsOswaldo Ferreira2017-02-022-0/+11
| * | Remain V3 endpoint unchangedOswaldo Ferreira2017-01-304-3/+1895
| * | Unify projects search by removing /projects/:search endpointOswaldo Ferreira2017-01-303-62/+4
* | | Merge branch 'api-fix-files' into 'master' Rémy Coutable2017-02-064-1/+11
|\ \ \ | |_|/ |/| |
| * | Ensure the right content is served for the build artifacts APIapi-fix-filesRobert Schilling2017-02-052-0/+6
| * | API: Fix file downloadingRobert Schilling2017-02-032-1/+5
* | | 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
| |\ \ \ \ \ \ \ \ \