summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* add link to cluster configuration from prometheus "getting started" stateMike Greiling2018-01-313-10/+30
* Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-3125-321/+332
|\
| * Merge branch 'fl-mr-widget' into 'master'Phil Hughes2018-01-314-39/+46
| |\
| | * Fix broken testfl-mr-widgetFilipa Lacerda2018-01-312-3/+3
| | * Move mr widget related links into a vue fileFilipa Lacerda2018-01-304-40/+47
| * | Merge branch 'axios-get-render-math' into 'master'Phil Hughes2018-01-311-13/+25
| |\ \
| | * | Replace $.get in render math with axiosaxios-get-render-mathClement Ho2018-01-301-13/+25
| | |/
| * | Use axios instead of jquery ajax for setCiStatusFaviconClement Ho2018-01-311-11/+6
| * | Merge branch 'ph-ajax-to-axios' into 'master'Filipa Lacerda2018-01-316-118/+88
| |\ \
| | * | potential fix for tests crashingPhil Hughes2018-01-301-2/+3
| | * | EE backport for callback being optionalPhil Hughes2018-01-301-1/+1
| | * | more EE backportsPhil Hughes2018-01-301-2/+10
| | * | backported changed from EEPhil Hughes2018-01-301-1/+5
| | * | fixed failing IDE testPhil Hughes2018-01-301-1/+1
| | * | changed commits.js to axiosPhil Hughes2018-01-301-16/+18
| | * | converted blob viewer to axiosPhil Hughes2018-01-301-14/+8
| | * | Converted API.js to axiosPhil Hughes2018-01-304-85/+46
| * | | Merge branch 'cal-label-fix' into 'master'Annabel Dunstone Gray2018-01-301-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Contribution calendar label cutoff fixcal-label-fixClement Ho2018-01-291-1/+1
| * | | Merge branch 'ph-ajax-into-axios' into 'master'Filipa Lacerda2018-01-306-89/+80
| |\ \ \
| | * | | cache jQuery selectorph-ajax-into-axiosPhil Hughes2018-01-301-5/+7
| | * | | Converted integration_settings_form to axiosPhil Hughes2018-01-291-25/+23
| | * | | Converted issuable_bulk_update_actions to axiosPhil Hughes2018-01-291-9/+4
| | * | | Converted issuable_index to axiosPhil Hughes2018-01-291-13/+15
| | * | | Converted group_label_subscription to axiosPhil Hughes2018-01-291-14/+13
| | * | | Converted graphs_show to axiosPhil Hughes2018-01-291-7/+9
| | * | | Converted gl_dropdown to axiosPhil Hughes2018-01-291-19/+12
| * | | | Merge branch 'update-create-item-dropdown-with-create-new-item-option' into '...Filipa Lacerda2018-01-301-13/+31
| |\ \ \ \
| | * | | | Add createNewItemFromValue option and clearDropdown methodupdate-create-item-dropdown-with-create-new-item-optionEric Eastwood2018-01-301-13/+31
| * | | | | Replace $.get in single file diff with axiosClement Ho2018-01-301-11/+15
| * | | | | Merge branch 'axios-post-label-manager' into 'master'Fatih Acet2018-01-301-18/+14
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Remove unnecessary returnaxios-post-label-managerClement Ho2018-01-241-1/+1
| | * | | | Replace $.post in label manager with axiosClement Ho2018-01-241-18/+14
| | |/ / /
| * | | | add noData empty state to prometheus graphsfix-prometheus-empty-state-no-dataMike Greiling2018-01-292-3/+16
| * | | | Replace $.post in edit blob with axiosClement Ho2018-01-291-5/+10
* | | | | fix eslint and formatting issuesMike Greiling2018-01-311-4/+4
* | | | | display manage application button only when it is installedMike Greiling2018-01-311-2/+5
* | | | | internationalize the "Manage" button labelMike Greiling2018-01-301-1/+4
* | | | | add button to configure prometheus integration from cluster pageMike Greiling2018-01-302-0/+7
* | | | | add manage button to application rows in cluster integrationMike Greiling2018-01-302-5/+28
|/ / / /
* | | | Merge branch 'fl-vue-mr-widget' into 'master'Phil Hughes2018-01-293-140/+193
|\ \ \ \
| * | | | Fix broken testfl-vue-mr-widgetFilipa Lacerda2018-01-291-2/+2
| * | | | [ci skip] Merge branch 'master' into fl-vue-mr-widgetFilipa Lacerda2018-01-2910-252/+228
| |\ \ \ \
| * | | | | Move mr_widget_merged into a vue fileFilipa Lacerda2018-01-263-140/+193
| | |_|_|/ | |/| | |
* | | | | Merge branch 'nogravatar-fix-default-avatar' into 'master'Fatih Acet2018-01-292-5/+3
|\ \ \ \ \
| * | | | | Fall back to default_avatar_url in issue assigment.Felix Geyer2018-01-282-5/+3
| | |_|_|/ | |/| | |
* | | | | Replace $.post in awards handler with axiosClement Ho2018-01-291-4/+8
* | | | | Disable MR check out button when source branch is deletedJacopo2018-01-291-0/+1
| |_|/ / |/| | |
* | | | normalize headers correctlyPhil Hughes2018-01-293-13/+5
* | | | fixed dashboard projects not being filterablePhil Hughes2018-01-291-1/+1