| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'ide-etag-polling' into 'master' | Filipa Lacerda | 2018-06-11 | 2 | -22/+36 |
| |\ | | | | | | | | | | | | | Fix IDE pipelines eTagPoll not stopping Closes #47678 See merge request gitlab-org/gitlab-ce!19636 | ||||
| | * | fixed specs | Phil Hughes | 2018-06-11 | 1 | -18/+29 |
| | | | |||||
| | * | Fix IDE pipelines eTagPoll not stopping | Phil Hughes | 2018-06-11 | 1 | -4/+7 |
| | | | | | | | | | Closes #47678 | ||||
| * | | Update MrWidgetAuthorTime and MRWidgetMerged spec | George Tsiolis | 2018-06-11 | 2 | -2/+2 |
| | | | |||||
| * | | Rename MrWidgetAuthorTime vue component | George Tsiolis | 2018-06-11 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'dz-jupyter-use-nip-io' into 'master' | Grzegorz Bizon | off until 20th June | 2018-06-11 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | Use nip.io instead of xip.io for jupyter domain suggestion See merge request gitlab-org/gitlab-ce!19576 | ||||
| | * | | Use nip.io instead of xip.io for jupyter domain suggestion | Dmitriy Zaporozhets | 2018-06-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | refactor monaco-editor import and stop storing as class property within editor | Mike Greiling | 2018-06-08 | 1 | -4/+5 |
| | | | | |||||
| * | | | remove need to pass monaco around through DI | Mike Greiling | 2018-06-07 | 4 | -10/+7 |
| | | | | |||||
| * | | | remove monacoLoader and import monaco directly within Editor class | Mike Greiling | 2018-06-07 | 7 | -76/+31 |
| | | | | |||||
| * | | | Backport of "Add assignee lists to boards" | Mario de la Ossa | 2018-06-07 | 6 | -6/+6 |
| | |/ |/| | |||||
| * | | Merge branch 'ce-4936-roadmap-navigation-presets' into 'master' | Phil Hughes | 2018-06-07 | 1 | -12/+11 |
| |\ \ | | | | | | | | | | | | | CE backport: Add timeframe helper methods See merge request gitlab-org/gitlab-ce!19553 | ||||
| | * | | Add timeframe helper methods | Kushal Pandya | 2018-06-07 | 1 | -12/+11 |
| | |/ | |||||
| * | | Merge branch 'feature/customizable-favicon' into 'master' | Douwe Maan | 2018-06-07 | 5 | -22/+65 |
| |\ \ | | | | | | | | | | | | | | | | | | | Customizable favicon Closes #15661 See merge request gitlab-org/gitlab-ce!14497 | ||||
| | * | | remove all .ico favicon variations, use png always | Alexis Reigel | 2018-06-05 | 2 | -11/+11 |
| | | | | | | | | | | | | | | | | the ci status icons are generated client side, wo we don't need the static files anymore. | ||||
| | * | | create favicon overlay on the client | Alexis Reigel | 2018-06-05 | 3 | -8/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the initial reason for this change was that graphicsmagick does not support writing to ico files. this fact lead to a chain of changes: 1. use png instead of ico (browser support is good enough) 2. render the overlays on the client using the canvas API. this way we only need to store the original favion and generate the overlay versions dynamically. this change also enables (next step) to simplify the handling of the stock favicons as well, as we don't need to generate all the versions upfront. | ||||
| | * | | fix resetFavicon so that it actually resets | Alexis Reigel | 2018-06-05 | 1 | -3/+8 |
| | | | | |||||
| * | | | fixed more specs | Phil Hughes | 2018-06-07 | 1 | -1/+11 |
| | | | | |||||
| * | | | fixed karma | Phil Hughes | 2018-06-07 | 1 | -0/+4 |
| | | | | |||||
| * | | | Fixes IDE button on merge requests not working with relative URL config | Phil Hughes | 2018-06-07 | 1 | -0/+25 |
| | |/ |/| | | | | | Closes #46438 | ||||
| * | | Merge branch 'ide-merge-requests-components' into 'master' | Filipa Lacerda | 2018-06-06 | 5 | -26/+311 |
| |\ \ | | | | | | | | | | | | | | | | | | | Show merge requests in IDE Closes #45184 See merge request gitlab-org/gitlab-ce!19318 | ||||
| | * | | component specs | Phil Hughes | 2018-06-06 | 3 | -0/+234 |
| | | | | |||||
| | * | | fixed mutations spec | Phil Hughes | 2018-06-06 | 1 | -8/+11 |
| | | | | |||||
| | * | | fixed karma | Phil Hughes | 2018-06-06 | 1 | -18/+66 |
| | | | | |||||
| * | | | Fix spec | Mark Chao | 2018-06-06 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'sh-improve-import-status-error' into 'master' | Fatih Acet | 2018-06-06 | 1 | -0/+18 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Show a more helpful error for import status Closes #47365 See merge request gitlab-org/gitlab-ce!19467 | ||||
| | * | | | Show a more helpful error for import status | Stan Hu | 2018-06-06 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Importing a project from GitHub for a project namespace that already exists would show an unhelpful error, "An error occurred while importing project." We now add the base message from Projects::CreateService when this fails. Closes #47365 | ||||
| * | | | | Adjust monitoring graphs to support widgets in EE | Mike Greiling | 2018-06-06 | 1 | -7/+3 |
| | |/ / |/| | | |||||
| * | | | Merge branch 'ide-jobs-log' into 'master' | Filipa Lacerda | 2018-06-06 | 7 | -0/+465 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Show job logs in web IDE Closes #46245 See merge request gitlab-org/gitlab-ce!19279 | ||||
| | * | | | added empty state | Phil Hughes | 2018-06-06 | 2 | -0/+20 |
| | | | | | |||||
| | * | | | component specs | Phil Hughes | 2018-06-06 | 3 | -0/+257 |
| | | | | | |||||
| | * | | | store specs | Phil Hughes | 2018-06-06 | 3 | -0/+188 |
| | |/ / | |||||
| * | | | Merge branch '46858-triggered-at' into 'master' | Kamil TrzciĆski | 2018-06-06 | 1 | -2/+5 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | Resolve "Manual job's triggered by datetime is wrong" Closes #46858 See merge request gitlab-org/gitlab-ce!19438 | ||||
| | * | | Use `started` key to show the triggered date | Filipa Lacerda | 2018-06-05 | 1 | -2/+5 |
| | |/ | |||||
| * | | Fix invisible rows on importer status | Stan Hu | 2018-06-06 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch '47049-performance-modal' into 'master' | Mike Greiling | 2018-06-05 | 1 | -0/+33 |
| |\ \ | | | | | | | | | | | | | | | | | | | Resolve "Performance bar modal is hard to read" Closes #47049 See merge request gitlab-org/gitlab-ce!19334 | ||||
| | * | | Improve modal prop interface47049-performance-modal | Clement Ho | 2018-06-04 | 1 | -0/+33 |
| | | | | |||||
| * | | | Resolve "BS4: Pagination is pipeline's page has no styling" | Sam Beckham | 2018-06-05 | 1 | -1/+1 |
| | |/ |/| | |||||
| * | | Support smarter system notes | Jose Ivan Vargas | 2018-06-05 | 3 | -1/+642 |
| | | | |||||
| * | | Merge branch '6287-epics-page-styling-is-broken' into 'master' | Clement Ho | 2018-06-05 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | Backport of Resolve "Epics Page Styling is broken" See merge request gitlab-org/gitlab-ce!19407 | ||||
| | * | | Backport of Resolve "Epics Page Styling is broken" | Clement Ho | 2018-06-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix labels showing up with no titlejivl-fix-labels-not-displayed-after-selection | Jose | 2018-06-04 | 1 | -0/+4 |
| |/ / | |||||
| * | | Revert "Merge branch '46833-sticky-polyfill' into 'master'" | Clement Ho | 2018-06-01 | 1 | -0/+79 |
| |/ | | | This reverts merge request !19304 | ||||
| * | Update position sticky polyfill | Paul Slaughter | 2018-06-01 | 1 | -79/+0 |
| | | |||||
| * | Merge branch 'ide-list-merge-requests' into 'master' | Filipa Lacerda | 2018-06-01 | 4 | -0/+249 |
| |\ | | | | | | | | | | | | | Show merge requests in web IDE Closes #45184 See merge request gitlab-org/gitlab-ce!18898 | ||||
| | * | Merge branch 'master' into ide-list-merge-requests | Phil Hughes | 2018-06-01 | 34 | -522/+987 |
| | |\ | |||||
| | * | | ability to search merge requests | Phil Hughes | 2018-05-30 | 1 | -3/+27 |
| | | | | | | | | | | | | | reset merge requests before fetch | ||||
| | * | | improved stored data | Phil Hughes | 2018-05-30 | 3 | -1/+31 |
| | | | | | | | | | | | | | created reset action to reset stored merge requests | ||||
| | * | | Merge branch 'master' into ide-list-merge-requests | Phil Hughes | 2018-05-30 | 27 | -52/+875 |
| | |\ \ | |||||
| | * | | | fixed tests failing caused by rewire | Phil Hughes | 2018-05-25 | 1 | -0/+2 |
| | | | | | |||||
