summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fl-mr-widget-1' into 'master'Phil Hughes2018-02-026-143/+189
|\
| * Fixes after reviewfl-mr-widget-1Filipa Lacerda2018-02-011-10/+16
| * Merge branch 'master' into fl-mr-widget-1Filipa Lacerda2018-02-0120-197/+368
| |\
| * | Transform `a` tag with button role into a `button`Filipa Lacerda2018-02-011-4/+6
| * | Moves widget header into a vue fileFilipa Lacerda2018-02-014-120/+142
| * | Moves merge help into a vue componentFilipa Lacerda2018-01-314-25/+41
* | | Merge branch 'fl-mr-widget-2' into 'master'Phil Hughes2018-02-027-58/+78
|\ \ \
| * | | Moves more mr widget components into vue filesfl-mr-widget-2Filipa Lacerda2018-02-017-58/+78
| | |/ | |/|
* | | Merge branch 'fix/improve-issue-note-dropdown' into 'master'Phil Hughes2018-02-021-1/+0
|\ \ \
| * | | Improve issue mr and branch dropdown buttonGeorge Tsiolis2018-01-291-1/+0
* | | | Merge branch 'add-confirmation-input-for-modals' into 'master'Clement Ho2018-02-011-0/+62
|\ \ \ \ | |_|/ / |/| | |
| * | | Add confirmation input componentJose Ivan Vargas2018-02-011-0/+62
* | | | Merge branch 'ph-axios-3' into 'master'Filipa Lacerda2018-02-017-110/+94
|\ \ \ \
| * | | | Converted todos.js to axiosPhil Hughes2018-02-011-22/+15
| * | | | Converted usage_ping.js to use axiosPhil Hughes2018-02-011-9/+10
| * | | | Converted pager.js to axiosPhil Hughes2018-02-011-17/+16
| * | | | Converted notifications_form.js to axiosPhil Hughes2018-02-011-19/+19
| * | | | Converted notes.js to axiosPhil Hughes2018-02-011-20/+15
| * | | | Converted branch_graph.js to axiosPhil Hughes2018-02-011-8/+8
| * | | | Converted mini_pipeline_graph_dropdown.js to axiosPhil Hughes2018-02-011-15/+11
* | | | | Merge branch '35779-realtime-update-of-pipeline-status-in-files-view' into 'm...Filipa Lacerda2018-02-014-0/+170
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added more tests and corrected typos35779-realtime-update-of-pipeline-status-in-files-viewJose Ivan Vargas2018-02-014-52/+72
| * | | | Restored some code, add hidden classJose Ivan Vargas2018-01-302-18/+5
| * | | | Added realtime prop and corrected specsJose Ivan Vargas2018-01-304-5/+35
| * | | | Added pipeline status to the files viewJose Ivan Vargas2018-01-304-0/+133
| |/ / /
* | | | Merge branch 'fix-internationalization-namespace' into 'master'Filipa Lacerda2018-02-011-2/+2
|\ \ \ \
| * | | | Remove namespaced internationalization importfix-internationalization-namespaceClement Ho2018-01-311-2/+2
* | | | | Merge branch 'axios-find-file' into 'master'Fatih Acet2018-02-011-13/+11
|\ \ \ \ \
| * | | | | Replace $.ajax in find file with axiosaxios-find-fileClement Ho2018-01-311-13/+11
| |/ / / /
* | | | | Replace $.ajax in activity calendar with axiosaxios-calendarClement Ho2018-01-311-9/+14
|/ / / /
* | | | 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