summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Expand)AuthorAgeFilesLines
* Resolve "New design for user deletion confirmation in admin area"Shah El-Rahman2018-02-084-0/+247
* Merge branch '41297-new-design-for-cancel-stop-pipeline-confirmation' into 'm...Clement Ho2018-02-086-13/+152
|\
| * Add modal for stopping and retrying pipelines41297-new-design-for-cancel-stop-pipeline-confirmationShah El-Rahman2018-02-076-13/+152
* | Resolve "New design for project deletion confirmation"Shah El-Rahman2018-02-083-0/+167
* | Merge branch '42462-edit-note' into 'master'Fatih Acet2018-02-071-0/+1
|\ \
| * | Resolve "Cancelling a second comment edit doesn't return its state to before ...Simon Knox2018-02-071-0/+1
* | | Replace $.ajax in profile.js with axiosClement Ho2018-02-071-17/+16
|/ /
* | Merge branch 'axios-diff-file-editor' into 'master'Fatih Acet2018-02-071-10/+11
|\ \
| * | Replace $.get in diff file editor with axiosaxios-diff-file-editorClement Ho2018-02-021-10/+11
* | | Merge branch '4656-ce-port-filtered-search-bar' into 'master'Clement Ho2018-02-079-49/+72
|\ \ \
| * | | Update class initialization syntaxKushal Pandya2018-02-075-6/+14
| * | | Export class instead of assigning to `gl`Kushal Pandya2018-02-071-4/+1
| * | | Make class initialization configurableKushal Pandya2018-02-072-38/+57
| * | | Remove `FilteredSearchTokenKeys` importKushal Pandya2018-02-071-1/+0
* | | | Merge branch 'clear-job-request-timeout' into 'master'Filipa Lacerda2018-02-071-1/+1
|\ \ \ \
| * | | | Clear the timeout in Jobs class after each testPhil Hughes2018-02-071-1/+1
* | | | | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-078-18/+86
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-0698-1056/+1863
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | style the prometheus integration service page according to designMike Greiling2018-01-311-0/+11
| * | | | | 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
| |\ \ \ \ \
| * | | | | | 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 '3559-ce-port-group-roadmap' into 'master'Filipa Lacerda2018-02-074-2/+150
|\ \ \ \ \ \ \
| * | | | | | | Add `convertObjectPropsToCamelCase` helper methodKushal Pandya2018-02-071-0/+21
| * | | | | | | Add `convertToCamelCase` helper methodKushal Pandya2018-02-071-0/+7
| * | | | | | | Add `8px` padding optionKushal Pandya2018-02-071-0/+1
| * | | | | | | Add more date helper functionsKushal Pandya2018-02-071-2/+121
| | |_|/ / / / | |/| | | | |
* | | | | | | Translate issuable sidebar34416-issue-i18nJarka Kadlecová2018-02-0710-42/+61
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'ce-39118-dynamic-pipeline-variables-fe' into 'master'Kamil Trzciński2018-02-077-23/+188
|\ \ \ \ \ \
| * | | | | | Add missing padding to CI variables protected itemMatija Čupić2018-02-051-0/+2
| * | | | | | Use dynamic variable list in scheduled pipelines and group/project CI secret ...Eric Eastwood2018-02-057-23/+186
* | | | | | | Merge branch 'search-autocomplete-axios' into 'master'Filipa Lacerda2018-02-071-16/+23
|\ \ \ \ \ \ \
| * | | | | | | Converted search_autocomplete.js to use axiossearch-autocomplete-axiosPhil Hughes2018-02-061-16/+23
* | | | | | | | Merge branch 'move-board-list-vue-component' into 'master'Phil Hughes2018-02-072-86/+91
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Move BoardList vue component to vue fileGeorge Tsiolis2018-02-062-86/+91
| |/ / / / / /
* | | | | | | Merge branch 'winh-kubernetes-clusters' into 'master'Phil Hughes2018-02-063-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clustersWinnie Hellmann2018-02-063-5/+5
* | | | | | | | Resolve "Add a link to documentation on how to get external ip in the Kuberne...Fabio Busatto2018-02-063-3/+27
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch '39550-group-labels-redesign' into 'master'Tim Zallmann2018-02-063-9/+39
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use sprite_icon and variables39550-group-labels-redesignAnnabel Dunstone Gray2018-02-052-2/+3
| * | | | | | Fix padding & font size on labelsAnnabel Dunstone Gray2018-01-302-3/+4
| * | | | | | Add modal for label deletionAnnabel Dunstone Gray2018-01-291-0/+4
| * | | | | | Change delete notice; update mobile stylesAnnabel Dunstone Gray2018-01-291-5/+19
| * | | | | | Start redesign of group labels pageAnnabel Dunstone Gray2018-01-291-6/+16
* | | | | | | 31885 - Ability to transfer a single group to another groupMayra Cabrera2018-02-063-1/+52
* | | | | | | Merge branch '41672-emphasize-gke-cluster-to-new-users' into 'master'Clement Ho2018-02-059-2/+244
|\ \ \ \ \ \ \