summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* improve sourcemap generationMike Greiling2017-01-102-2/+3
* use ~ to reference non-local scripts instead of resolve.rootMike Greiling2017-01-101-4/+2
* migrate all tests into a single webpack bundleMike Greiling2017-01-101-2/+1
* include spec_helper within karma config rather than each individual testMike Greiling2017-01-101-2/+3
* include common libraries within spec_helperMike Greiling2017-01-101-1/+1
* simplify and combine karma file patternsMike Greiling2017-01-101-10/+3
* Swapped out teaspoon for karmaLuke "Jared" Bennett2017-01-102-2/+32
* precompile webpack assets when testingMike Greiling2017-01-102-0/+4
* disable "use strict" in babel config as it was broken in sprocketsMike Greiling2017-01-101-1/+7
* migrate all javascript asset bundles and require syntaxMike Greiling2017-01-102-19/+22
* replace application.js sprockets output with webpack-generated equivalentMike Greiling2017-01-061-2/+18
* temporarily regress to babel 5 for parity with sprockets-es6 gemMike Greiling2017-01-061-4/+1
* conditionally apply webpack-dev-server configMike Greiling2017-01-061-1/+4
* optimize production output and generate sourcemapsMike Greiling2017-01-061-1/+15
* compile es6/es2015 with babelMike Greiling2017-01-061-1/+18
* add webpack, webpack-rails, and webpack-dev-server along with a simple hello ...Mike Greiling2017-01-062-0/+51
* Merge branch 'monkey-patch-comment' into 'master' Rémy Coutable2017-01-051-0/+6
|\
| * Explain why there is a monkey-patchJacob Vosmaer2016-12-271-0/+6
* | Merged the 'groups' and 'projects' tabs when viewing user profilesJames Gregory2016-12-291-1/+0
* | Fix 500 error when visit group from admin area if group name contains dotdz-improve-admin-group-routingDmitriy Zaporozhets2016-12-281-1/+1
|/
* Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern2016-12-261-1/+1
|\
| * Add more storage statisticsMarkus Koller2016-12-211-1/+1
* | Merge branch 'permit-uploadedfile-scalar' into 'master' Rémy Coutable2016-12-231-0/+16
|\ \
| * | Monkey-patch StrongParameters for ::UploadedFileJacob Vosmaer2016-12-231-0/+16
* | | Merge branch '25896-fix-404-katax-fonts' into 'master' Alfredo Sumaran2016-12-221-0/+2
|\ \ \
| * | | Add KaTeX fonts to assets paths and precompileHiroyuki Sato2016-12-221-0/+2
* | | | Merge branch '23638-remove-builds-tab' into 'master' Kamil Trzciński2016-12-211-4/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Changes after reviewFilipa Lacerda2016-12-211-2/+0
| * | | Remove builds tab from commitFilipa Lacerda2016-12-211-1/+0
| * | | Removes builds tab from merge requestFilipa Lacerda2016-12-211-1/+0
* | | | Merge branch 'backport-mr-widget-ci-js' into 'master' Alfredo Sumaran2016-12-211-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove unneeded bundle refs.backport-mr-widget-ci-jsBryce Johnson2016-12-211-2/+0
| * | | Backport moving MR widget CI JS out of script tag.Bryce Johnson2016-12-211-0/+3
* | | | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-212-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-205-1/+12
| |\ \ \ | | | |/ | | |/|
| * | | Improve sourcesKamil Trzcinski2016-12-191-1/+1
| * | | Minor adjustments API MattermostZ.J. van de Weg2016-12-191-5/+1
| * | | Merge branch 'master' into 'zj-mattermost-slash-config'Zeger-Jan van de Weg2016-12-1811-10/+43
| |\ \ \
| * | | | Fix configure routeLuke "Jared" Bennett2016-12-171-1/+1
| * | | | Add tests for auto configure slash commandsZ.J. van de Weg2016-12-161-1/+0
| * | | | Add MattermostControllerZ.J. van de Weg2016-12-161-0/+6
| * | | | Base work for auto config MM slash commandsZ.J. van de Weg2016-12-162-0/+6
* | | | | Merge branch 'authentiq-id-oauth-support' into 'master' Rémy Coutable2016-12-211-0/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Added support for Authentiq oauth providerAlex2016-12-211-0/+10
| | |/ / | |/| |
* | | | Merge branch '19703-direct-link-pipelines' into 'master' Grzegorz Bizon2016-12-201-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-198-6/+35
| |\ \ \ | | |/ /
| * | | Render stage dropdown in separate API call as HTMLKamil Trzcinski2016-12-191-0/+1
* | | | Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-202-1/+7
|\ \ \ \
| * | | | Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-192-2/+2
| * | | | Gogs ImporterKim "BKC" Carlbäcker2016-12-192-1/+7
| | |/ / | |/| |
View Lorry Controller Status