summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | Manual Configuration instead of Activation. Prometheus Service just got a bit...Pawel Chojnacki2018-01-022-8/+29
| * | | | | | | | | Move client creation to Prometheus Application, manufacture proper rest clientPawel Chojnacki2018-01-022-34/+18
| * | | | | | | | | wipPawel Chojnacki2018-01-023-7/+80
* | | | | | | | | | Merge branch '3559-ce-port-group-roadmap' into 'master'Filipa Lacerda2018-02-075-3/+151
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
| * | | | | | | | | | Add support for adding custom class on content wrapper elementKushal Pandya2018-02-071-1/+1
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'zj-refs-hash' into 'master'Sean McGivern2018-02-072-7/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't use rugged in Repository#refs_hashZeger-Jan van de Weg2018-02-072-7/+3
* | | | | | | | | | | Merge branch '34416-issue-i18n' into 'master'Sean McGivern2018-02-0715-84/+107
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Translate issuable sidebar34416-issue-i18nJarka Kadlecová2018-02-0715-84/+107
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'rd-35856-backport-lfs-file-locking-api' into 'master'Sean McGivern2018-02-0711-3/+208
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-apiRubén Dávila2018-02-0711-3/+208
* | | | | | | | | | | | Merge branch 'fix/reduce-number-of-ref-exists-calls' into 'master'Sean McGivern2018-02-072-5/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove allow_n_plus_1_calls from MergeRequests::CreateServicefix/reduce-number-of-ref-exists-callsAhmad Sherif2018-02-071-4/+1
| * | | | | | | | | | | Check for keep-around commits once if target and source projects are the sameAhmad Sherif2018-02-071-1/+1
* | | | | | | | | | | | Merge branch '41209-ci-linter-fails-on-gitlab-ci-blob-viewer' into 'master'Kamil Trzciński2018-02-072-5/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Handle all YAML parser exceptions in .gitlab-ci.yml (fixes #41209)41209-ci-linter-fails-on-gitlab-ci-blob-viewerDylan Griffith2018-02-072-5/+2
* | | | | | | | | | | | | Merge branch 'fix/gb/fix-redundant-pipeline-stages' into 'master'Kamil Trzciński2018-02-072-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '4457cf9d178dc9912fd9c16427ad81b389179d00' into fix/gb/fix-redun...fix/gb/fix-redundant-pipeline-stagesGrzegorz Bizon2018-02-0764-198/+377
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Improve exceptions messages in code creating stagesGrzegorz Bizon2018-02-061-2/+4
| * | | | | | | | | | | | | Make exception in ensure stage service more descriptiveGrzegorz Bizon2018-02-061-2/+5
| * | | | | | | | | | | | | Merge branch 'master' into fix/gb/fix-redundant-pipeline-stagesGrzegorz Bizon2018-02-06373-3086/+4783
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix transactions-related race condition in stages codeGrzegorz Bizon2018-02-051-1/+6
| * | | | | | | | | | | | | | Revert create job service because of load balancingGrzegorz Bizon2018-02-053-25/+9
| * | | | | | | | | | | | | | Fix specs for retry build after making stages uniqueGrzegorz Bizon2018-01-251-1/+1
| * | | | | | | | | | | | | | Do not raise an error when trying to persist a jobGrzegorz Bizon2018-01-242-3/+3
| * | | | | | | | | | | | | | Add a new service for creating detached CI/CD jobsGrzegorz Bizon2018-01-243-9/+25
* | | | | | | | | | | | | | | Merge branch '38265-stuckcijobsworker-wrongly-detects-cancels-stuck-builds-wh...Kamil Trzciński2018-02-072-0/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Update RedisCacheable#cache_attribute_keyMatija Čupić2018-02-051-1/+1
| * | | | | | | | | | | | | | | Save runner attributes only if there's changesMatija Čupić2018-02-051-1/+1
| * | | | | | | | | | | | | | | Extract attribute caching to RedisCacheable concernMatija Čupić2018-02-052-35/+44
| * | | | | | | | | | | | | | | Improve runner attribute cachineMatija Čupić2018-02-051-30/+22
| * | | | | | | | | | | | | | | Merge branch 'master' into 38265-stuckcijobsworker-wrongly-detects-cancels-st...Matija Čupić2018-02-04235-2196/+2833
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update list of allowed attribute updates in RunnerMatija Čupić2018-02-041-3/+11
| * | | | | | | | | | | | | | | Refactor runner attribute caching implementationMatija Čupić2018-02-041-27/+44
| * | | | | | | | | | | | | | | Handle updating only contacted_at runner cacheMatija Čupić2018-01-291-1/+1
| * | | | | | | | | | | | | | | Make Ci::Runner#online? slightly more performantMatija Čupić2018-01-291-1/+1
| * | | | | | | | | | | | | | | Expose Ci::Runner#cached_contacted_at as TimeMatija Čupić2018-01-291-1/+5
| * | | | | | | | | | | | | | | Generelized cached attribute usage in runnerMatija Čupić2018-01-291-8/+19
| * | | | | | | | | | | | | | | Move info update implementation to Ci::Runner modelMatija Čupić2018-01-291-3/+23
| * | | | | | | | | | | | | | | Check cache in Ci::Runner#online?Matija Čupić2018-01-291-1/+8
* | | | | | | | | | | | | | | | Merge branch '38175-add-domain-field-to-auto-devops-application-setting' into...Kamil Trzciński2018-02-076-10/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Use domain.presence instead of domain to avoid empty strings38175-add-domain-field-to-auto-devops-application-settingMatija Čupić2018-02-061-1/+1
| * | | | | | | | | | | | | | | Use Gitlab::CurrentSettings instead of current_application_settingsMatija Čupić2018-02-031-3/+1
| * | | | | | | | | | | | | | | Merge branch 'master' into 38175-add-domain-field-to-auto-devops-application-...Matija Čupić2018-02-0315-187/+403
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Refactor AutoDevopsHelper.missing_auto_devops_domain?Matija Čupić2018-02-021-1/+1
| * | | | | | | | | | | | | | | | Merge branch 'master' into 38175-add-domain-field-to-auto-devops-application-...Matija Čupić2018-02-0274-228/+188
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \