summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/components
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'refactor/move-mr-widget-unresolved-discussions-vue-component' i...Mike Greiling2018-03-192-27/+33
|\
| * Move UnresolvedDiscussions vue componentGeorge Tsiolis2018-03-082-27/+33
* | removed useless v-ifPhil Hughes2018-03-141-4/+3
* | improved markupPhil Hughes2018-03-131-24/+20
* | fixed breakpointPhil Hughes2018-03-131-44/+59
* | updated specsPhil Hughes2018-03-131-14/+24
* | Fix styling of multiple environments in merge request widgetPhil Hughes2018-03-132-113/+124
* | Merge branch 'refactor/move-mr-widget-nothing-to-merge-vue-component' into 'm...Clement Ho2018-03-122-44/+47
|\ \
| * | Move NothingToMerge vue componentGeorge Tsiolis2018-03-082-44/+47
| |/
* | Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'Phil Hughes2018-03-121-1/+1
|\ \
| * | Fix "Remove source branch" button in MR widget during MWPS state42814-fix-remove-source-branch-when-mwpsEric Eastwood2018-03-081-1/+1
| |/
* | require jQuery to be explicitly importedremove-jquery-globalsMike Greiling2018-03-091-0/+1
* | Merge branch 'merge-request-widget-source-branch-improvements' into 'master'Filipa Lacerda2018-03-092-2/+36
|\ \
| * | Dont show remove source branch checkbox when user cannot remove the branchPhil Hughes2018-03-082-2/+36
| |/
* | Merge branch 'refactor/move-mr-widget-memory-usage-and-graph-components' into...Phil Hughes2018-03-082-44/+51
|\ \ | |/ |/|
| * Move MemoryGraph and MemoryUsage vue componentsGeorge Tsiolis2018-03-082-44/+51
* | Address frontend feedbackBob Van Landuyt2018-03-081-1/+2
* | Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-071-0/+19
* | Removes btn-transparent and btn-clipboard as default classes for clipboard bu...43502-clipboard-btnFilipa Lacerda2018-03-061-0/+1
|/
* Move EE-specific JavaScript files to ee/app/assets/javascriptsRémy Coutable2018-02-261-3/+3
* Merge branch 'backport-qa_78' into 'master'Grzegorz Bizon2018-02-252-2/+3
|\
| * test merge request rebaseFelipe Artur2018-02-192-2/+3
* | Harmonize CE and EE JS codereduce-ce-ee-disrepancies-in-jsRémy Coutable2018-02-221-1/+2
|/
* Show loading button inline in MR widgetfl-refresh-btnFilipa Lacerda2018-02-161-1/+4
* Moves mr widget components into vue filesfl-mr-widget-4Filipa Lacerda2018-02-134-37/+49
* Remove not needed default statementFilipa Lacerda2018-02-091-1/+0
* Moves missing branch into a vue filefl-mr-widget-missing-branchFilipa Lacerda2018-02-082-43/+63
* Backport of mr_widget_author.vue EE changesPhil Hughes2018-02-021-1/+21
* Merge branch 'fl-mr-widget-1' into 'master'Phil Hughes2018-02-025-141/+187
|\
| * Fixes after reviewfl-mr-widget-1Filipa Lacerda2018-02-011-10/+16
| * Merge branch 'master' into fl-mr-widget-1Filipa Lacerda2018-02-012-37/+43
| |\
| * | Transform `a` tag with button role into a `button`Filipa Lacerda2018-02-011-4/+6
| * | Moves widget header into a vue fileFilipa Lacerda2018-02-013-119/+141
| * | Moves merge help into a vue componentFilipa Lacerda2018-01-313-24/+40
* | | Moves more mr widget components into vue filesfl-mr-widget-2Filipa Lacerda2018-02-017-58/+78
| |/ |/|
* | Fix broken testfl-mr-widgetFilipa Lacerda2018-01-311-1/+2
* | Move mr widget related links into a vue fileFilipa Lacerda2018-01-302-37/+42
|/
* Merge branch 'fl-vue-mr-widget' into 'master'Phil Hughes2018-01-292-139/+192
|\
| * Fix broken testfl-vue-mr-widgetFilipa Lacerda2018-01-291-2/+2
| * Move mr_widget_merged into a vue fileFilipa Lacerda2018-01-262-139/+192
* | Disable MR check out button when source branch is deletedJacopo2018-01-291-0/+1
|/
* Adds missing i18nFilipa Lacerda2018-01-261-2/+2
* Moves components into vue files:fl-mr-widget-componentsFilipa Lacerda2018-01-254-202/+252
* Update missing pathsfl-more-mr-widgetFilipa Lacerda2018-01-253-3/+3
* Merge branch 'master' into fl-more-mr-widgetFilipa Lacerda2018-01-256-100/+132
|\
| * Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-246-100/+132
* | Moves status icon into a vue file and adds testsFilipa Lacerda2018-01-2422-83/+110
|/
* Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-2210-10/+10
|\
| * Backport to match EE icons42225-mr-iconsFilipa Lacerda2018-01-1911-11/+11
* | Update icon to match EEvue-mr-widget-stateFilipa Lacerda2018-01-191-1/+1