summaryrefslogtreecommitdiff
path: root/spec/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fl-mr-widget-missing-branch' into 'master'Phil Hughes2018-02-091-25/+9
|\
| * Moves missing branch into a vue filefl-mr-widget-missing-branchFilipa Lacerda2018-02-081-25/+9
* | Replace $.post in importer status with axiosClement Ho2018-02-091-0/+47
|/
* Refactored merge_requests/show path in dispatcher.jsConstance Okoghenun2018-02-081-14/+6
* Merge branch '41297-new-design-for-cancel-stop-pipeline-confirmation' into 'm...Clement Ho2018-02-082-10/+10
|\
| * Add modal for stopping and retrying pipelines41297-new-design-for-cancel-stop-pipeline-confirmationShah El-Rahman2018-02-072-10/+10
* | Resolve "Cancelling a second comment edit doesn't return its state to before ...Simon Knox2018-02-072-47/+66
* | Merge branch '4656-ce-port-filtered-search-bar' into 'master'Clement Ho2018-02-076-32/+36
|\ \
| * | Import FilteredSearchTokenKeys, update class initialization syntax4656-ce-port-filtered-search-barKushal Pandya2018-02-071-5/+6
| * | Import and use `FilteredSearchTokenKeys` independentlyKushal Pandya2018-02-075-27/+30
* | | Merge branch 'clear-job-request-timeout' into 'master'Filipa Lacerda2018-02-071-18/+27
|\ \ \
| * | | Clear the timeout in Jobs class after each testPhil Hughes2018-02-071-18/+27
* | | | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-072-28/+2
|\ \ \ \
| * \ \ \ Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-0630-828/+1850
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | fix broken karma specs due to removed functionMike Greiling2018-01-312-28/+2
* | | | | Merge branch '3559-ce-port-group-roadmap' into 'master'Filipa Lacerda2018-02-073-0/+99
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add `convertObjectPropsToCamelCase` helper methodKushal Pandya2018-02-071-0/+29
| * | | | Add `convertToCamelCase` helper methodKushal Pandya2018-02-071-0/+6
| * | | | Update tests for date helper functionsKushal Pandya2018-02-071-0/+64
| | |/ / | |/| |
* | | | Merge branch 'ce-39118-dynamic-pipeline-variables-fe' into 'master'Kamil TrzciƄski2018-02-074-38/+312
|\ \ \ \
| * | | | Use dynamic variable list in scheduled pipelines and group/project CI secret ...Eric Eastwood2018-02-054-38/+312
* | | | | Merge branch 'move-board-list-vue-component' into 'master'Phil Hughes2018-02-071-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Move BoardList vue component to vue fileGeorge Tsiolis2018-02-061-1/+1
* | | | | Merge branch 'winh-kubernetes-clusters' into 'master'Phil Hughes2018-02-061-5/+8
|\ \ \ \ \
| * | | | | Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clustersWinnie Hellmann2018-02-061-5/+8
| |/ / / /
* | | | | Resolve "Add a link to documentation on how to get external ip in the Kuberne...Fabio Busatto2018-02-061-0/+1
* | | | | Refactor :trace to :trace_live in specShinya Maeda2018-02-061-1/+1
|/ / / /
* | | | Merge branch '41672-emphasize-gke-cluster-to-new-users' into 'master'Clement Ho2018-02-053-0/+392
|\ \ \ \ | |/ / / |/| | |
| * | | Restore feature_highlight code41672-emphasize-gke-cluster-to-new-usersEric Eastwood2018-02-053-0/+392
* | | | fixed unhandled promise rejectionPhil Hughes2018-02-051-2/+1
* | | | fixed task list specPhil Hughes2018-02-052-15/+37
* | | | fixed notes_spec.jsPhil Hughes2018-02-051-1/+1
* | | | fixed failing karma specs caused by TaskListPhil Hughes2018-02-055-76/+109
* | | | Converted right_sidebar.js to use axiosPhil Hughes2018-02-051-9/+13
* | | | Converted prometheus_metrics.js to use axiosPhil Hughes2018-02-051-18/+26
|/ / /
* | | Merge branch 'refactor-ci-variable-list-for-future-usage-in-4110' into 'master'Filipa Lacerda2018-02-024-145/+236
|\ \ \
| * | | Refactor CI variable list code for usage with CI/CD settings page secret vari...refactor-ci-variable-list-for-future-usage-in-4110Eric Eastwood2018-01-314-145/+236
| | |/ | |/|
* | | Merge branch '24167__color_label' into 'master'Douwe Maan2018-02-021-2/+11
|\ \ \
| * | | Fix minorsTony Rom2018-02-011-4/+4
| * | | Add Colors to GitLab Flavored MarkdownTony Rom2018-01-291-0/+9
* | | | Merge branch 'ph-axios-2' into 'master'Filipa Lacerda2018-02-027-324/+462
|\ \ \ \
| * \ \ \ Merge branch 'master' into ph-axios-2Phil Hughes2018-02-011-83/+48
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | fixed axios mock not being restoredPhil Hughes2018-02-011-0/+4
| * | | | remove useless ajaxPost methodPhil Hughes2018-02-011-13/+0
| * | | | fixed notes_spec.jsPhil Hughes2018-02-011-58/+124
| * | | | fixed issue_spec transient failurePhil Hughes2018-01-311-32/+27
| * | | | fixed eslint :see_no_evil:Phil Hughes2018-01-311-1/+0
| * | | | Merge branch 'master' into ph-axios-2Phil Hughes2018-01-3112-263/+375
| |\ \ \ \
| * | | | | fixed eslintPhil Hughes2018-01-311-2/+1
| * | | | | Converted common_utils to axiosPhil Hughes2018-01-311-3/+5