summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* No more and/orDouwe Maan2017-02-213-3/+3
* Merge branch '1363-redo-mailroom-support' into 'master' Douwe Maan2017-02-211-4/+1
|\
| * Use newer mail_room to get `require_relative` supportGabriel Mazetto2017-02-201-4/+1
* | Merge branch '28204-option-to-disable-webpack-dev-server-livereload' into 'ma...Alfredo Sumaran2017-02-201-0/+2
|\ \
| * | Pick up option from gdk to disable webpack dev server livereload28204-option-to-disable-webpack-dev-server-livereloadEric Eastwood2017-02-151-0/+2
* | | Merge branch 'authentiq-backchannel-logout' into 'master' Douwe Maan2017-02-201-0/+11
|\ \ \
| * | | Added support for Authentiq Back-Channel LogoutAlexandros Keramidas2017-02-201-0/+11
* | | | Merge branch 'fix-vue-production-build' into 'master' Jacob Schatz2017-02-201-2/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | utilize pre-minified Vue in production since no CJS distribution is availablefix-vue-production-buildMike Greiling2017-02-191-2/+1
* | | | Merge branch 'remove-imports-loader-window-bind' into 'master' Filipa Lacerda2017-02-201-6/+0
|\ \ \ \ | |/ / / |/| | |
| * | | remove imports loaderMike Greiling2017-02-171-6/+0
* | | | Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master' Clement Ho2017-02-181-0/+3
|\ \ \ \
| * | | | Todo done clicking is kind of unusable.Jacopo2017-02-171-0/+3
| | |/ / | |/| |
* | | | Merge branch 'change_queue_weight' into 'master' Yorick Peterse2017-02-181-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Increase process_commit queue weight from 2 to 3blackst0ne2017-02-171-1/+1
| |/ /
* | | Merge branch 'fix/gb/remove-gitlab-ci-module' into 'master' Kamil TrzciƄski2017-02-171-8/+0
|\ \ \
| * | | Remove legacy GitlabCi module from initializersfix/gb/remove-gitlab-ci-moduleGrzegorz Bizon2017-02-151-8/+0
| | |/ | |/|
* | | Merge branch '26200-convert-sidebar-to-dropdown' into 'master'Sean McGivern2017-02-172-10/+1
|\ \ \ | |_|/ |/| |
| * | Remove all instances of theme_id; require downtimeAnnabel Dunstone Gray2017-02-151-1/+1
| * | Drop theme ID from users tableAnnabel Dunstone Gray2017-02-151-8/+0
| * | Remove all gitlab theme related codeAnnabel Dunstone Gray2017-02-151-1/+0
* | | remove trailing commadont-compress-development-assetsMike Greiling2017-02-161-1/+1
* | | replace deprecated NoErrorsPlugin with NoEmitOnErrorsPluginMike Greiling2017-02-161-1/+1
* | | only compress assets in productionMike Greiling2017-02-161-4/+4
* | | Merge branch 'instrument-in-karma' into 'master' Alfredo Sumaran2017-02-162-1/+11
|\ \ \
| * | | Move babel config for instanbul to karma config (!9286)winniehell2017-02-162-1/+11
| |/ /
* | | Merge branch 'fe-paginated-environments-api' into 'paginate-environments-bund...paginate-environments-bundleFilipa Lacerda2017-02-162-0/+5
|\ \ \
| * | | First iterationFilipa Lacerda2017-02-151-0/+1
| * | | Merge branch 'master' into fe-paginated-environments-apiFilipa Lacerda2017-02-123-16/+41
| |\ \ \
| * | | | Add route for environment folder and expose an APIGrzegorz Bizon2017-02-091-0/+4
* | | | | 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
| |/