summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \
| * | | | | | | | add dependency license approvalsMike Greiling2017-01-141-10/+111
| * | | | | | | | more post-merge fixesMike Greiling2017-01-131-1/+1
| * | | | | | | | Added gzip compressionPhil Hughes2017-01-131-1/+5
| * | | | | | | | add phantomJS to karma configMike Greiling2017-01-131-0/+1
| * | | | | | | | Merge branch 'master' into go-go-gadget-webpackPhil Hughes2017-01-133-1/+9
| |\ \ \ \ \ \ \ \
| * | | | | | | | | prevent karma from reloading on save until webpack is readyMike Greiling2017-01-101-1/+1
| * | | | | | | | | 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
View Lorry Controller Status