summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-pick-security' into 'master'Stan Hu2018-02-097-43/+88
* Merge branch 'sh-fix-rebase-in-progress-nplus-one' into 'master'Marin Jankovski2018-02-081-3/+5
* Annotate charts page for internationalizationShah El-Rahman2018-02-081-13/+18
* Resolve "New design for user deletion confirmation in admin area"Shah El-Rahman2018-02-087-12/+283
* 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
* | Annotate graph page for internationalizationShah El-Rahman2018-02-082-3/+3
* | Resolve "New design for project deletion confirmation"Shah El-Rahman2018-02-084-1/+175
* | 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
* | | Address naming suggestionOswaldo Ferreira2018-02-071-4/+3
* | | Remove duplicate calls of MergeRequest#can_be_reverted?Oswaldo Ferreira2018-02-071-2/+10
* | | 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-0716-26/+228
|\ \ \ \ \
| * | | | | Avoid unless/elsePawel Chojnacki2018-02-071-4/+4
| * | | | | Fix order of checks in editable? method.Pawel Chojnacki2018-02-071-3/+4
| * | | | | Make prometheus service querying approach much nicer wrt to arity and default...Pawel Chojnacki2018-02-071-3/+4
| * | | | | add i8n to the Prometheus integration settings pageMike Greiling2018-02-061-8/+8
| * | | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-06290-1853/+3336
| |\ \ \ \ \
| * | | | | | use find_or_initialize to fetch prometheus_service instancePawel Chojnacki2018-02-061-1/+1
| * | | | | | remove unnecessary commentPawel Chojnacki2018-02-061-1/+0
| * | | | | | fix rubocop errors and ensure prometheus_installed? doesn't fail in CI tests ...Mike Greiling2018-01-311-1/+2
| * | | | | | style the prometheus integration service page according to designMike Greiling2018-01-313-10/+33
| * | | | | | hide prometheus manual integration form when auto config is activeMike Greiling2018-01-312-18/+27
| * | | | | | change prometheus service description text to match designMike Greiling2018-01-311-1/+1
| * | | | | | add link to cluster configuration from prometheus "getting started" stateMike Greiling2018-01-314-10/+31
| * | | | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-3139-408/+425
| |\ \ \ \ \ \
| * | | | | | | 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-303-1/+9
| * | | | | | | add manage button to application rows in cluster integrationMike Greiling2018-01-302-5/+28
| * | | | | | | Fix rubocopPawel Chojnacki2018-01-301-0/+1
| * | | | | | | fix service generic testsPawel Chojnacki2018-01-301-4/+1
| * | | | | | | Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-29309-1791/+2843
| |\ \ \ \ \ \ \
| * | | | | | | | check if service is templatePawel Chojnacki2018-01-171-0/+1
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-17563-6877/+10452
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix rubocop warningsPawel Chojnacki2018-01-041-3/+6
| * | | | | | | | | Test Prometheus proxy client generationPawel Chojnacki2018-01-041-2/+7
| * | | | | | | | | Cleanup PrometheusService testsPawel Chojnacki2018-01-041-4/+0
| * | | | | | | | | Cleanup implementation and add cluster finding testsPawel Chojnacki2018-01-043-18/+19
View Lorry Controller Status