summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'update-vue-2.1' into 'master' Fatih Acet2017-02-261-1/+1
|\ | | | | | | | | Update Vue to v2.1 See merge request !9386
| * use CommonJS vue distributionMike Greiling2017-02-201-1/+1
| |
* | Merge branch '27989-disable-counting-tags' into 'master' Rémy Coutable2017-02-231-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Disable unused tags count cache for Projects, Builds and Runners Closes #27989 See merge request !9467
| * | Disable unused tags count cache for Projects, Builds and RunnersPawel Chojnacki2017-02-231-0/+5
| | | | | | | | | | | | + remove complete leftover when Issues were tagged using acts_as_taggable
* | | Merge branch '28450-test-compiling-frontend-assets-for-production-in-ci' ↵Jacob Schatz2017-02-232-0/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Test compiling frontend assets for production in CI" Closes #28450 See merge request !9396
| * | | approve opener license (MIT)Mike Greiling2017-02-211-0/+6
| | | |
| * | | add webpack bundle analyzer to production outputMike Greiling2017-02-211-0/+14
| | | |
* | | | Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-231-2/+2
| | | | | | | | | | | | | | | | This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
* | | | Manually correct autocorrectDouwe Maan2017-02-231-0/+2
| | | |
* | | | Fix new offensesDouwe Maan2017-02-231-7/+7
| | | |
* | | | Enable Style/WordArrayDouwe Maan2017-02-232-9/+9
| | | |
* | | | Enable Style/MultilineArrayBraceLayoutDouwe Maan2017-02-231-9/+11
| | | |
* | | | Prefer leading style for Style/DotPositionDouwe Maan2017-02-231-2/+2
| | | |
* | | | Fix code for copsDouwe Maan2017-02-231-21/+23
| | | |
* | | | Enable Style/ConditionalAssignmentDouwe Maan2017-02-231-6/+6
| | | |
* | | | Enable Style/SpaceInsideBracketsDouwe Maan2017-02-233-7/+7
| | | |
* | | | Enable Style/MutableConstantDouwe Maan2017-02-233-3/+3
| |/ / |/| |
* | | No more and/orDouwe Maan2017-02-213-3/+3
| | |
* | | Merge branch '1363-redo-mailroom-support' into 'master' Douwe Maan2017-02-211-4/+1
|\ \ \ | |/ / |/| | | | | | | | Redo internals of Incoming Mail Support See merge request !9385
| * | 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 ↵Alfredo Sumaran2017-02-201-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Pick up option from GDK to disable webpack dev server livereload Closes #28204 See merge request !9287
| * | | Pick up option from gdk to disable webpack dev server livereload28204-option-to-disable-webpack-dev-server-livereloadEric Eastwood2017-02-151-0/+2
| | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/28204
* | | | Merge branch 'authentiq-backchannel-logout' into 'master' Douwe Maan2017-02-201-0/+11
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Remote logout functionality on Authentiq OAuth provider See merge request !9381
| * | | 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 bundler-ready Vue distribution See merge request !9357
| * | | 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 window-binding hack with imports-loader See merge request !9123
| * | | 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. Closes #25465 See merge request !8691
| * | | | Todo done clicking is kind of unusable.Jacopo2017-02-171-0/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | The Done button will change to an Undo button and the line item will be greyed out. Bold links will be unbolded. The user can undo the task by clicking the Undo button.
* | | | Merge branch 'change_queue_weight' into 'master' Yorick Peterse2017-02-181-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Increase process_commit queue weight from 2 to 3 Closes #25828 See merge request !9326
| * | | 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 initializers See merge request !9279
| * | | 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
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Resolve "Update global sidebar to dropdown" Closes #26200 See merge request !9199
| * | 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 See merge request !9286
| * | | Move babel config for instanbul to karma config (!9286)winniehell2017-02-162-1/+11
| |/ /
* | | Merge branch 'fe-paginated-environments-api' into ↵paginate-environments-bundleFilipa Lacerda2017-02-162-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'paginate-environments-bundle' Integrate with new environments API See merge request !8954
| * | | First iterationFilipa Lacerda2017-02-151-0/+1
| | | |
| * | | Merge branch 'master' into fe-paginated-environments-apiFilipa Lacerda2017-02-123-16/+41
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (97 commits) convert js-cookie dependency to an npm module convert timeago.js dependency to an npm module remove vue from vendor since it is now in node_modules Add CHANGELOG file Stylize blockquote in notification emails Add js prefix to right sidebar Replace accidentally deleted metaclick Remove right padding from navbar-collapse on large screens Add changelog common_utils merge conflicts Set sidebar height to 100% if at top of page Set height of fixed sidebars with js Add sticky sidebar on wiki page Fix comment button test for slash commands Fix time tracking spec Fix issue boards sidebar alignment and sidebar toggle spec Fix failing conflicts test Fix build sidebar scrolling Refactor JS Fix pinned sidebar alignment ...
| * | | | 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 emails Closes #20305 See merge request !9163
| * | | | | Set `Auto-Submitted: auto-generated` header to emailsSemyon Pupkov2017-02-151-0/+1
| | |/ / / | |/| | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20305
* | | | | Merge branch 'beautiful-karma-output' into 'master' Alfredo Sumaran2017-02-161-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Make Karma output look nicer for CI See merge request !9165