Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'feature_add_mermaid' into 'master' | Phil Hughes | 2017-11-22 | 3 | -1/+33 |
|\ | | | | | | | | | | | | | Add support of Mermaid Closes #3711 See merge request gitlab-org/gitlab-ce!15107 | ||||
| * | Add support of Mermaid | Vitaliy @blackst0ne Klachkov | 2017-11-22 | 3 | -1/+33 |
| | | |||||
* | | Fix blank states using old css40377-blank-states | Filipa Lacerda | 2017-11-21 | 2 | -19/+23 |
| | | |||||
* | | Merge branch '38869-milestone' into 'master' | Phil Hughes | 2017-11-21 | 9 | -207/+175 |
|\ \ | | | | | | | | | | | | | Export code as ES6 modules See merge request gitlab-org/gitlab-ce!15503 | ||||
| * | | Export code as ES6 modules38869-milestone | Filipa Lacerda | 2017-11-20 | 9 | -207/+175 |
| | | | |||||
* | | | Backport ability to enable/disable file attachments in issuable form | Clement Ho | 2017-11-21 | 5 | -3/+35 |
|/ / | |||||
* | | Merge branch '39497-inline-edit-issue-on-mobile' into 'master' | Annabel Dunstone Gray | 2017-11-20 | 2 | -53/+53 |
|\ \ | | | | | | | | | | | | | | | | | | | Add inline editing to issues on mobile Closes #39497 See merge request gitlab-org/gitlab-ce!15438 | ||||
| * | | Add inline editing to issues on mobile | Eric Eastwood | 2017-11-18 | 2 | -53/+53 |
| | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39497 | ||||
* | | | Merge branch '39167-async-boards-sidebar' into 'master' | Sean McGivern | 2017-11-20 | 11 | -77/+107 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Make Issue Boards sidebar subscriptions async Closes #39167 and #40094 See merge request gitlab-org/gitlab-ce!15364 | ||||
| * | | | Async notification subscriptions in issue boards | Eric Eastwood | 2017-11-20 | 11 | -77/+107 |
| | | | | |||||
* | | | | Remove pretty time from main.js | Filipa Lacerda | 2017-11-20 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge branch '38451-fe-sprite-icons-vue-component' into 'master' | Annabel Dunstone Gray | 2017-11-20 | 1 | -4/+3 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Update Icons Documentation about Icon Vue Component Closes #38451 See merge request gitlab-org/gitlab-ce!15171 | ||||
| * | | | Added + Updated Document for Vue Component | Tim Zallmann | 2017-11-16 | 1 | -4/+3 |
| | | | | |||||
* | | | | Use axios instead of vue resource - step 1 | Filipa Lacerda | 2017-11-20 | 5 | -19/+30 |
| |_|/ |/| | | |||||
* | | | moved magic number into variablesimproved-changes-dropdown | Phil Hughes | 2017-11-17 | 1 | -1/+2 |
| | | | |||||
* | | | Improved the design of the changed files dropdown | Phil Hughes | 2017-11-17 | 1 | -1/+1 |
| | | | | | | | | | | | | Closes #36687 | ||||
* | | | Exports a couple of project related code as es6 modules | Filipa Lacerda | 2017-11-17 | 8 | -311/+272 |
| | | | |||||
* | | | Resolve "lock/confidential issuable sidebar custom svg icons iteration" | Luke "Jared" Bennett | 2017-11-16 | 4 | -38/+68 |
|/ / | |||||
* | | Backport delete epic changesbackport-delete-epic | Clement Ho | 2017-11-15 | 4 | -6/+36 |
|/ | |||||
* | Merge branch 'update-emoji-digests-with-latest-from-gemojione' into 'master' | Filipa Lacerda | 2017-11-15 | 2 | -6/+31 |
|\ | | | | | | | | | | | | | Update Emoji digests and assets with latest from Gemojione v3.3.0 Closes #32634 See merge request gitlab-org/gitlab-ce!15390 | ||||
| * | Move :gay_pride_flag: to flags categoryupdate-emoji-digests-with-latest-from-gemojione | Eric Eastwood | 2017-11-15 | 2 | -2/+0 |
| | | |||||
| * | Add rainbow_flag to emoji support map | Eric Eastwood | 2017-11-15 | 2 | -6/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested on the following platforms that split the emoji into separate characters currently. - Windows 10 FCU - Chrome 62.0.3202.89 - Firefox 57.0b14 - MS Edge 41.16299.15.0 - macOS 10.12.6 - Chrome 63.0.3239.40 - Safari 11.0.1 (12604.3.5.1.1) - Firefox 57.0 - Ubuntu 16.04 - Chromium 62.0.3202.75 - Firefox 56.0 | ||||
| * | Regenerate emoji digests with latest gemojione | Eric Eastwood | 2017-11-14 | 2 | -0/+2 |
| | | |||||
* | | Merge branch 'ce-backport-39009-fix-approvals-showing-up-in-empty-mr-widget' ↵ | Phil Hughes | 2017-11-15 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | | | | | into 'master' Remove approvals when in empty MR widget state -- CE backport See merge request gitlab-org/gitlab-ce!15362 | ||||
| * | Backport spec changes from EE remove approvals in empty statece-backport-39009-fix-approvals-showing-up-in-empty-mr-widget | Eric Eastwood | 2017-11-13 | 1 | -1/+1 |
| | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3376 | ||||
* | | Merge branch 'fix-typo' into 'master' | Annabel Dunstone Gray | 2017-11-14 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Fix typo See merge request gitlab-org/gitlab-ce!15358 | ||||
| * | | Fix typofix-typo | Clement Ho | 2017-11-13 | 1 | -1/+1 |
| |/ | |||||
* | | Stops page reload when changing tabs or pages - uses API requests instead | Filipa Lacerda | 2017-11-14 | 4 | -114/+180 |
| | | |||||
* | | Merge branch '40092-fix-cluster-size' into 'master' | Tim Zallmann | 2017-11-14 | 2 | -1/+34 |
|\ \ | | | | | | | | | | | | | Formats bytes to human readable number in registry table See merge request gitlab-org/gitlab-ce!15359 | ||||
| * | | Formats bytes to human reabale number in registry table40092-fix-cluster-size | Filipa Lacerda | 2017-11-13 | 2 | -1/+34 |
| |/ | |||||
* | | Merge branch 'slack_landing_page-ce-backport' into 'master' | Jacob Schatz | 2017-11-14 | 1 | -0/+4 |
|\ \ | | | | | | | | | | | | | slack landing page ce backport See merge request gitlab-org/gitlab-ce!15354 | ||||
| * | | url_utility and style backport | Luke "Jared" Bennett | 2017-11-13 | 1 | -0/+4 |
| |/ | |||||
* | | Merge branch '38869-project' into 'master' | Phil Hughes | 2017-11-14 | 5 | -164/+142 |
|\ \ | | | | | | | | | | | | | Export project, projectAvatar and projectImport as ES6 modules See merge request gitlab-org/gitlab-ce!15355 | ||||
| * | | Export project, projectAvatar and projectImport as ES6 modules38869-project | Filipa Lacerda | 2017-11-13 | 5 | -164/+142 |
| |/ | |||||
* | | Merge branch 'bvl-refresh-member-listing-on-removal' into 'master' | Tim Zallmann | 2017-11-13 | 1 | -12/+0 |
|\ \ | |/ |/| | | | | | | | | | Don't perform a JS request when deleting a membership. Closes #39933 and #31720 See merge request gitlab-org/gitlab-ce!15344 | ||||
| * | Don't perform a JS request when deleting a membership.bvl-refresh-member-listing-on-removal | Bob Van Landuyt | 2017-11-13 | 1 | -12/+0 |
| | | |||||
* | | fix to allow integer label refernces | haseeb | 2017-11-13 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'multi-editor-store-specs' into 'master' | Filipa Lacerda | 2017-11-13 | 2 | -6/+6 |
|\ \ | | | | | | | | | | | | | Added tests to multi-file Vuex store See merge request gitlab-org/gitlab-ce!15147 | ||||
| * | | added missing specsmulti-editor-store-specs | Phil Hughes | 2017-11-10 | 1 | -1/+1 |
| | | | |||||
| * | | test updates | Phil Hughes | 2017-11-10 | 1 | -1/+1 |
| | | | |||||
| * | | Added tests to multi-file Vuex store | Phil Hughes | 2017-11-10 | 1 | -4/+4 |
| |/ | |||||
* | | Export text utils as ES6 modules | Filipa Lacerda | 2017-11-13 | 17 | -206/+227 |
| | | |||||
* | | Merge branch '39564-clear-filter-on-gitlab-dropdown-open' into 'master' | Tim Zallmann | 2017-11-12 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | | | | | Clear filter on gl_dropdown open Closes #39564 See merge request gitlab-org/gitlab-ce!15214 | ||||
| * | Change fix, instead of hacking in a filter clear every time, fix the root ↵39564-clear-filter-on-gitlab-dropdown-open | Luke "Jared" Bennett | 2017-11-07 | 1 | -3/+1 |
| | | | | | | | | cause by only selecting elements for that dropdown instance | ||||
| * | Run filter method for filterable gl_dropdown instances | Luke "Jared" Bennett | 2017-11-06 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'disable-issue-action-button-if-isSubmitting' into 'master' | Fatih Acet | 2017-11-09 | 1 | -1/+2 |
|\ \ | | | | | | | | | | | | | Disable issue action button whilst submitting and test See merge request gitlab-org/gitlab-ce!15211 | ||||
| * | | Disable issue action button whilst submitting and testdisable-issue-action-button-if-isSubmitting | Luke "Jared" Bennett | 2017-11-06 | 1 | -1/+2 |
| |/ | |||||
* | | Enables scroll to bottom once user has scrolled back to bottom in job log | Filipa Lacerda | 2017-11-09 | 1 | -26/+24 |
| | | |||||
* | | Resolve "Merge request widget - CI information has different margins" | Filipa Lacerda | 2017-11-08 | 4 | -92/+109 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | 2017-11-07 | 3 | -3/+6 |
|\ \ | | | | | | | | | | add-ingress-to-cluster-applications |