Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Enable Style/SpaceInsideBrackets | Douwe Maan | 2017-02-23 | 3 | -7/+7 |
| | |||||
* | Enable Style/MutableConstant | Douwe Maan | 2017-02-23 | 3 | -3/+3 |
| | |||||
* | No more and/or | Douwe Maan | 2017-02-21 | 3 | -3/+3 |
| | |||||
* | Merge branch '1363-redo-mailroom-support' into 'master' | Douwe Maan | 2017-02-21 | 1 | -4/+1 |
|\ | | | | | | | | | Redo internals of Incoming Mail Support See merge request !9385 | ||||
| * | Use newer mail_room to get `require_relative` support | Gabriel Mazetto | 2017-02-20 | 1 | -4/+1 |
| | | |||||
* | | Merge branch '28204-option-to-disable-webpack-dev-server-livereload' into ↵ | Alfredo Sumaran | 2017-02-20 | 1 | -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-livereload | Eric Eastwood | 2017-02-15 | 1 | -0/+2 |
| | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/28204 | ||||
* | | | Merge branch 'authentiq-backchannel-logout' into 'master' | Douwe Maan | 2017-02-20 | 1 | -0/+11 |
|\ \ \ | | | | | | | | | | | | | | | | | Remote logout functionality on Authentiq OAuth provider See merge request !9381 | ||||
| * | | | Added support for Authentiq Back-Channel Logout | Alexandros Keramidas | 2017-02-20 | 1 | -0/+11 |
| | | | | |||||
* | | | | Merge branch 'fix-vue-production-build' into 'master' | Jacob Schatz | 2017-02-20 | 1 | -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-build | Mike Greiling | 2017-02-19 | 1 | -2/+1 |
| | | | | |||||
* | | | | Merge branch 'remove-imports-loader-window-bind' into 'master' | Filipa Lacerda | 2017-02-20 | 1 | -6/+0 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Remove window-binding hack with imports-loader See merge request !9123 | ||||
| * | | | remove imports loader | Mike Greiling | 2017-02-17 | 1 | -6/+0 |
| | | | | |||||
* | | | | Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master' | Clement Ho | 2017-02-18 | 1 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Todo done clicking is kind of unusable. Closes #25465 See merge request !8691 | ||||
| * | | | | Todo done clicking is kind of unusable. | Jacopo | 2017-02-17 | 1 | -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 Peterse | 2017-02-18 | 1 | -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 3 | blackst0ne | 2017-02-17 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'fix/gb/remove-gitlab-ci-module' into 'master' | Kamil Trzciński | 2017-02-17 | 1 | -8/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | Remove legacy GitlabCi module from initializers See merge request !9279 | ||||
| * | | | Remove legacy GitlabCi module from initializersfix/gb/remove-gitlab-ci-module | Grzegorz Bizon | 2017-02-15 | 1 | -8/+0 |
| | |/ | |/| | |||||
* | | | Merge branch '26200-convert-sidebar-to-dropdown' into 'master' | Sean McGivern | 2017-02-17 | 2 | -10/+1 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | Resolve "Update global sidebar to dropdown" Closes #26200 See merge request !9199 | ||||
| * | | Remove all instances of theme_id; require downtime | Annabel Dunstone Gray | 2017-02-15 | 1 | -1/+1 |
| | | | |||||
| * | | Drop theme ID from users table | Annabel Dunstone Gray | 2017-02-15 | 1 | -8/+0 |
| | | | |||||
| * | | Remove all gitlab theme related code | Annabel Dunstone Gray | 2017-02-15 | 1 | -1/+0 |
| | | | |||||
* | | | remove trailing commadont-compress-development-assets | Mike Greiling | 2017-02-16 | 1 | -1/+1 |
| | | | |||||
* | | | replace deprecated NoErrorsPlugin with NoEmitOnErrorsPlugin | Mike Greiling | 2017-02-16 | 1 | -1/+1 |
| | | | |||||
* | | | only compress assets in production | Mike Greiling | 2017-02-16 | 1 | -4/+4 |
| | | | |||||
* | | | Merge branch 'instrument-in-karma' into 'master' | Alfredo Sumaran | 2017-02-16 | 2 | -1/+11 |
|\ \ \ | | | | | | | | | | | | | | | | | Move babel config for instanbul to karma config See merge request !9286 | ||||
| * | | | Move babel config for instanbul to karma config (!9286) | winniehell | 2017-02-16 | 2 | -1/+11 |
| |/ / | |||||
* | | | Merge branch 'fe-paginated-environments-api' into ↵paginate-environments-bundle | Filipa Lacerda | 2017-02-16 | 2 | -0/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'paginate-environments-bundle' Integrate with new environments API See merge request !8954 | ||||
| * | | | First iteration | Filipa Lacerda | 2017-02-15 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into fe-paginated-environments-api | Filipa Lacerda | 2017-02-12 | 3 | -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 API | Grzegorz Bizon | 2017-02-09 | 1 | -0/+4 |
| | | | | | |||||
* | | | | | Merge branch 'add-auto-submited-header' into 'master' | Sean McGivern | 2017-02-16 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set `Auto-Submitted: auto-generated` header to emails Closes #20305 See merge request !9163 | ||||
| * | | | | | Set `Auto-Submitted: auto-generated` header to emails | Semyon Pupkov | 2017-02-15 | 1 | -0/+1 |
| | |/ / / | |/| | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20305 | ||||
* | | | | | Merge branch 'beautiful-karma-output' into 'master' | Alfredo Sumaran | 2017-02-16 | 1 | -1/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | Make Karma output look nicer for CI See merge request !9165 | ||||
| * | | | | Make Karma output look nicer for CI (!9165) | winniehell | 2017-02-15 | 1 | -1/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'fix-production-assets' into 'master' | Alfredo Sumaran | 2017-02-15 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Only load istanbul plugin in development mode See merge request !9261 | ||||
| * | | | | only load istanbul plugin in development mode | Mike Greiling | 2017-02-15 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Stop Pikaday using momentno-more-moment | Phil Hughes | 2017-02-14 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge branch 'cover-my-karma' into 'master' | Clement Ho | 2017-02-14 | 2 | -0/+8 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Reintroduce coverage report for JavaScript Closes #27826 and #20757 See merge request !9133 | ||||
| * | | | Reintroduce coverage report for JavaScript (!9133) | winniehell | 2017-02-11 | 2 | -0/+8 |
| |/ / | |||||
* | | | only print errors and warnings from webpack dev serversilence-webpack | Simon Knox | 2017-02-11 | 1 | -1/+2 |
|/ / | |||||
* | | rspec_profiling: Discover the correct branch name in GitLab CI | Nick Thomas | 2017-02-10 | 1 | -0/+8 |
| | | |||||
* | | approve new dependencies | Mike Greiling | 2017-02-09 | 1 | -0/+12 |
| | | |||||
* | | upgrade to webpack 2.2.x | Mike Greiling | 2017-02-09 | 1 | -13/+14 |
| | | |||||
* | | approve MIT license for wordwrap submodule | Mike Greiling | 2017-02-09 | 1 | -0/+6 |
| | | |||||
* | | upgrade babel to v6 | Mike Greiling | 2017-02-09 | 1 | -4/+1 |
| | | |||||
* | | exclude node_modules from imports-loader wrapper | Mike Greiling | 2017-02-09 | 1 | -0/+1 |
|/ | |||||
* | Merge branch 'dz-create-nested-groups-via-ui' into 'master' | Dmitriy Zaporozhets | 2017-02-09 | 1 | -0/+1 |
|\ | | | | | | | | | Allow creating nested group via UI See merge request !8786 | ||||
| * | Allow creating nested group via UIdz-create-nested-groups-via-ui | Dmitriy Zaporozhets | 2017-02-07 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> |