Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Map configuration to directory locations and add defaults to NFS HA doc.27685-update_ha_docs | Marin Jankovski | 2017-02-06 | 1 | -9/+9 |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Marin Jankovski | 2017-02-06 | 545 | -4330/+8609 |
|\ | |||||
| * | 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 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Use webpack_port file if it exists | Phil Hughes | 2017-01-19 | 2 | -1/+12 |
| | * | | | | | | | | Merge branch 'master' into go-go-gadget-webpack | Mike Greiling | 2017-01-18 | 215 | -710/+3716 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into go-go-gadget-webpack | Phil Hughes | 2017-01-17 | 59 | -510/+659 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into go-go-gadget-webpack | Mike Greiling | 2017-01-15 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into go-go-gadget-webpack | Mike Greiling | 2017-01-15 | 37 | -1385/+1524 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | optimize gitlab ci to only run npm install once | Mike Greiling | 2017-01-15 | 1 | -3/+4 |
| | * | | | | | | | | | | | | add dependency license approvals | Mike Greiling | 2017-01-14 | 1 | -10/+111 |
| | * | | | | | | | | | | | | fix missing components in cycle_analytics_bundle | Mike Greiling | 2017-01-14 | 1 | -1/+1 |
| | * | | | | | | | | | | | | fix requireAll within filtered search bundle | Mike Greiling | 2017-01-13 | 1 | -8/+2 |
| | * | | | | | | | | | | | | rewrite test which relied on teaspoon quirk | Mike Greiling | 2017-01-13 | 1 | -2/+6 |
| | * | | | | | | | | | | | | more post-merge fixes | Mike Greiling | 2017-01-13 | 9 | -26/+24 |
| | * | | | | | | | | | | | | Added gzip compression | Phil Hughes | 2017-01-13 | 2 | -1/+6 |
| | * | | | | | | | | | | | | add phantomJS to karma config | Mike Greiling | 2017-01-13 | 2 | -0/+2 |
| | * | | | | | | | | | | | | phantomJS requires "use strict" for polyfill to properly work | Mike Greiling | 2017-01-13 | 1 | -1/+4 |
| | * | | | | | | | | | | | | phantomJS doesn't allow us to spyOn history.replaceState | Mike Greiling | 2017-01-13 | 7 | -14/+40 |
| | * | | | | | | | | | | | | Merge branch 'master' into go-go-gadget-webpack | Phil Hughes | 2017-01-13 | 369 | -2171/+10065 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |