summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'add-auto-submited-header' into 'master'Sean McGivern2017-02-161-0/+1
|\
| * Set `Auto-Submitted: auto-generated` header to emailsSemyon Pupkov2017-02-151-0/+1
* | Merge branch 'beautiful-karma-output' into 'master' Alfredo Sumaran2017-02-161-1/+2
|\ \
| * | Make Karma output look nicer for CI (!9165)winniehell2017-02-151-1/+2
* | | Merge branch 'fix-production-assets' into 'master' Alfredo Sumaran2017-02-151-1/+1
|\ \ \
| * | | only load istanbul plugin in development modeMike Greiling2017-02-151-1/+1
| |/ /
* | | Stop Pikaday using momentno-more-momentPhil Hughes2017-02-141-0/+1
|/ /
* | Merge branch 'cover-my-karma' into 'master' Clement Ho2017-02-142-0/+8
|\ \
| * | Reintroduce coverage report for JavaScript (!9133)winniehell2017-02-112-0/+8
| |/
* | only print errors and warnings from webpack dev serversilence-webpackSimon Knox2017-02-111-1/+2
|/
* rspec_profiling: Discover the correct branch name in GitLab CINick Thomas2017-02-101-0/+8
* approve new dependenciesMike Greiling2017-02-091-0/+12
* upgrade to webpack 2.2.xMike Greiling2017-02-091-13/+14
* approve MIT license for wordwrap submoduleMike Greiling2017-02-091-0/+6
* upgrade babel to v6Mike Greiling2017-02-091-4/+1
* exclude node_modules from imports-loader wrapperMike Greiling2017-02-091-0/+1
* Merge branch 'dz-create-nested-groups-via-ui' into 'master' Dmitriy Zaporozhets2017-02-091-0/+1
|\
| * Allow creating nested group via UIdz-create-nested-groups-via-uiDmitriy Zaporozhets2017-02-071-0/+1
* | Merge branch 'remove-jquery-ui-sortable' into 'master' Jacob Schatz2017-02-081-1/+1
|\ \
| * | Removed jQuery UI sortableremove-jquery-ui-sortablePhil Hughes2017-02-061-1/+1
| |/
* | Revert "Merge branch 'fix-karma-coverage' into 'master'"revert-135b4f75Clement Ho2017-02-071-9/+1
* | fix karma coverage reportMike Greiling2017-02-071-1/+9
* | Merge branch '26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipe...Kamil TrzciƄski2017-02-071-0/+1
|\ \
| * | Changed the controller/route name to 'ci/cd' and renamed the corresponding filesJose Ivan Vargas2017-02-061-1/+1
| * | changed pipelines controller name to ci_cd_pipelinesJose Ivan Vargas2017-02-061-1/+1
| * | Converted the views to partials that compose the menu item "pipelines"Jose Ivan Vargas2017-02-061-0/+1
* | | Merge branch 'fe-commit-mr-pipelines' into 'master' Fatih Acet2017-02-061-0/+1
|\ \ \ | |/ / |/| |
| * | Use webpack to require filesFilipa Lacerda2017-02-051-0/+1
| |/
* | Merge branch 'remove-sidekiq-backup-ar-threads' into 'master' Douwe Maan2017-02-061-3/+1
|\ \
| * | Don't use backup AR connections for Sidekiqremove-sidekiq-backup-ar-threadsYorick Peterse2017-02-061-3/+1
* | | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-068-32/+319
|\ \ \ | |/ /
| * | transpile all javascript files with babelMike Greiling2017-02-061-2/+2
| |/
| * Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-033-3/+3
| |\
| | * Reuse endpoint to list issues for a list instead of create a new oneDouglas Barbosa Alexandre2017-02-031-3/+1
| | * Used issue bulk update instead of different endpointPhil Hughes2017-02-031-1/+0
| | * Changed where data gets loadedPhil Hughes2017-02-031-1/+2
| | * Add issues to boards listPhil Hughes2017-02-031-0/+2
| * | consistently use single quotesMike Greiling2017-02-021-3/+3
| * | DRY with Gitlab.config.webpack.dev_server referenceswebpackMike Greiling2017-02-021-10/+12
| * | Merge branch 'master' into webpackMike Greiling2017-02-022-0/+2
| |\ \
| * | | disable webpack proxy in rspec environment due to conflicts with webmock gemMike Greiling2017-02-021-12/+20
| * | | configure webpack dev server port via environment variableMike Greiling2017-02-011-10/+2
| * | | add rack middleware to proxy webpack dev serverMike Greiling2017-02-014-0/+42
| * | | remove dev-server config from development environmentMike Greiling2017-01-311-7/+0
| * | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-311-0/+1
| |\ \ \
| * \ \ \ Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-283-13/+15
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-276-113/+137
| |\ \ \ \ \
| * | | | | | Use webpack_port file if it existsPhil Hughes2017-01-192-1/+12
| * | | | | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-182-0/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-151-1/+0
| |\ \ \ \ \ \ \