Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ensure karma fails if it cannot load all spec filesfix-ignored-spec-failures | Mike Greiling | 2017-02-07 | 1 | -2/+6 |
* | Merge branch 'babel-all-the-things' into 'master' | Fatih Acet | 2017-02-06 | 3 | -4/+11 |
|\ | |||||
| * | add CHANGELOG entry for !8988babel-all-the-things | Mike Greiling | 2017-02-06 | 1 | -0/+5 |
| * | transpile all javascript files with babel | Mike Greiling | 2017-02-06 | 1 | -2/+2 |
| * | add npm run webpack command | Mike Greiling | 2017-02-06 | 1 | -2/+4 |
* | | Merge branch 'fix-ace-editor-modules' into 'master' | Fatih Acet | 2017-02-06 | 1 | -8/+17 |
|\ \ | |||||
| * | | lazy-load ace config so that we can ensure window.gon existsfix-ace-editor-modules | Mike Greiling | 2017-02-05 | 1 | -10/+17 |
| * | | fix ace editor modules to include asset digest in production | Mike Greiling | 2017-02-05 | 1 | -2/+4 |
| |/ | |||||
* | | Merge branch 'terminal-max-session-time' into 'master' | Kamil Trzciński | 2017-02-06 | 16 | -13/+107 |
|\ \ | |||||
| * | | Introduce maximum session time for terminal websocket connectionterminal-max-session-time | Adam Niedzielski | 2017-02-06 | 16 | -13/+107 |
| |/ | |||||
* | | Merge branch '22007-unify-projects-search' into 'master' | Rémy Coutable | 2017-02-06 | 9 | -65/+1910 |
|\ \ | |||||
| * | | Adjust V3 projects typo on spec22007-unify-projects-search | Oswaldo Ferreira | 2017-02-03 | 1 | -1/+1 |
| * | | Update V3 to V4 docs | Oswaldo Ferreira | 2017-02-02 | 2 | -0/+11 |
| * | | Remain V3 endpoint unchanged | Oswaldo Ferreira | 2017-01-30 | 4 | -3/+1895 |
| * | | Unify projects search by removing /projects/:search endpoint | Oswaldo Ferreira | 2017-01-30 | 3 | -62/+4 |
* | | | Merge branch 'api-fix-files' into 'master' | Rémy Coutable | 2017-02-06 | 4 | -1/+11 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Ensure the right content is served for the build artifacts APIapi-fix-files | Robert Schilling | 2017-02-05 | 2 | -0/+6 |
| * | | API: Fix file downloading | Robert Schilling | 2017-02-03 | 2 | -1/+5 |
* | | | Merge branch 'sh-add-index-for-label-count' into 'master' | Yorick Peterse | 2017-02-05 | 2 | -1/+13 |
|\ \ \ | |||||
| * | | | Add index to labels for `type` and project_id`sh-add-index-for-label-count | Stan Hu | 2017-02-04 | 2 | -1/+13 |
* | | | | Merge branch 'slash-commands-typo' into 'master' | Grzegorz Bizon | 2017-02-05 | 2 | -1/+5 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fixed typo | Jason Aquino | 2017-02-04 | 2 | -1/+5 |
* | | | | Merge branch 'fix-rack-proxy' into 'master' | Douwe Maan | 2017-02-04 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | fix rack-proxy dependency in productionfix-rack-proxy | Mike Greiling | 2017-02-04 | 1 | -2/+2 |
* | | | | Merge branch 'ux-guide-button-placement' into 'master' | Achilleas Pipinellis | 2017-02-04 | 1 | -0/+14 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | [ci skip] UX Guide: Button placement in groupsux-guide-button-placement | Allison Whilden | 2017-02-03 | 1 | -0/+14 |
* | | | | Merge branch 'go-go-gadget-webpack' into 'master' | Jacob Schatz | 2017-02-04 | 204 | -985/+2780 |
|\ \ \ \ | |||||
| * | | | | fix failing testgo-go-gadget-webpack | Mike Greiling | 2017-02-03 | 1 | -1/+1 |
| * | | | | fix Vue warnings for missing element | Mike Greiling | 2017-02-03 | 1 | -2/+2 |
| * | | | | Merge branch 'master' into go-go-gadget-webpack | Mike Greiling | 2017-02-03 | 100 | -1992/+2066 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into go-go-gadget-webpack | Mike Greiling | 2017-02-03 | 287 | -2144/+3741 |
| |\ \ \ \ \ | |||||
| * | | | | | | consistently use single quotes | Mike Greiling | 2017-02-02 | 1 | -3/+3 |
| * | | | | | | allow application.js to require other scripts which start with application* | Mike Greiling | 2017-02-02 | 1 | -1/+1 |
| * | | | | | | DRY with Gitlab.config.webpack.dev_server referenceswebpack | Mike Greiling | 2017-02-02 | 1 | -10/+12 |
| * | | | | | | Merge branch 'master' into webpack | Mike Greiling | 2017-02-02 | 154 | -612/+1805 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | disable webpack proxy in rspec environment due to conflicts with webmock gem | Mike Greiling | 2017-02-02 | 1 | -12/+20 |
| * | | | | | | | remove changes to Procfile | Mike Greiling | 2017-02-01 | 1 | -1/+0 |
| * | | | | | | | configure webpack dev server port via environment variable | Mike Greiling | 2017-02-01 | 1 | -10/+2 |
| * | | | | | | | add rack middleware to proxy webpack dev server | Mike Greiling | 2017-02-01 | 7 | -0/+71 |
| * | | | | | | | remove dev-server config from development environment | Mike Greiling | 2017-01-31 | 1 | -7/+0 |
| * | | | | | | | Merge branch 'master' into go-go-gadget-webpack | Mike Greiling | 2017-01-31 | 176 | -850/+1829 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | add CHAGELOG.md entry for webpack branch | Mike Greiling | 2017-01-29 | 1 | -0/+4 |
| * | | | | | | | | fix failing rspec build | Mike Greiling | 2017-01-28 | 1 | -4/+4 |
| * | | | | | | | | fix test failure for merge request widget | Mike Greiling | 2017-01-28 | 1 | -1/+1 |
| * | | | | | | | | fix duplicate data-toggle attribute | Mike Greiling | 2017-01-28 | 1 | -2/+0 |
| * | | | | | | | | update rake tasks | Mike Greiling | 2017-01-28 | 2 | -2/+2 |
| * | | | | | | | | fix frontend tests | Mike Greiling | 2017-01-28 | 2 | -10/+21 |
| * | | | | | | | | Merge branch 'master' into go-go-gadget-webpack | Mike Greiling | 2017-01-28 | 59 | -135/+651 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | remove sprockets-es6 and execjs dependencies | Mike Greiling | 2017-01-28 | 2 | -10/+0 |
| * | | | | | | | | | Merge branch 'master' into go-go-gadget-webpack | Mike Greiling | 2017-01-27 | 1135 | -4777/+11247 |
| |\ \ \ \ \ \ \ \ \ |