summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | 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 mode See merge request !9261
| * | | | 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 Closes #27826 and #20757 See merge request !9133
| * | | 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 UI See merge request !8786
| * Allow creating nested group via UIdz-create-nested-groups-via-uiDmitriy Zaporozhets2017-02-071-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'remove-jquery-ui-sortable' into 'master' Jacob Schatz2017-02-081-1/+1
|\ \ | | | | | | | | | | | | Removed jQuery UI sortable See merge request !8478
| * | 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
| | | | | | This reverts merge request !9044
* | fix karma coverage reportMike Greiling2017-02-071-1/+9
| |
* | Merge branch ↵Kamil Trzciński2017-02-071-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | '26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipelines-settings-pages' into 'master' Merge Triggers, Runners, Variables and Pipelines to a single option called "CI/CD Pipelines" Closes #26165 See merge request !8430