summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Use explicit instance of prometheus service and add access methods to itPawel Chojnacki2017-06-073-13/+26
* expand Namespaces:: and refactoring yaml parsing out of MetricGroup classPawel Chojnacki2017-06-061-1/+1
* Remove service help, add URL field helpkushalpandya2017-06-011-12/+2
* Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...Pawel Chojnacki2017-05-3021-246/+141
|\
| * Merge branch '32790-pipeline_schedules-pages-throwing-error-500' into 'master'Kamil Trzciński2017-05-291-7/+3
| |\
| | * Validate parameters when active is falseShinya Maeda2017-05-291-7/+3
| * | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-296-121/+38
| |\ \
| | * | Hide nested group UI/API support for MySQLYorick Peterse2017-05-172-5/+1
| | * | Use CTEs for nested groups and authorizationsYorick Peterse2017-05-176-121/+42
| * | | Fix: Milestone - Participants list is showing duplicate assigneesfix_duplicated_assignees_on_milestone_pageValery Sizov2017-05-291-1/+1
| | |/ | |/|
| * | Merge branch 'fix_counter_cache_invalidation' into 'master'Douwe Maan2017-05-261-2/+2
| |\ \
| | * | Set "expire_in" for counters cacheValery Sizov2017-05-261-2/+2
| * | | Add API URL to JIRA settings31448-jira-urlsJarka Kadlecova2017-05-261-12/+25
| |/ /
| * | Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-255-40/+33
| |\ \
| | * | Change code comment formattingdm-diff-cleanupDouwe Maan2017-05-231-1/+3
| | * | Remove @commit in compare and MR controllersDouwe Maan2017-05-231-0/+3
| | * | Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-235-40/+28
| * | | Merge branch 'winh-label-textcolor-default' into 'master'Grzegorz Bizon2017-05-251-0/+4
| |\ \ \
| | * | | Provide default for calculating label text color (!11681)winh2017-05-251-0/+4
| * | | | Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-252-7/+5
| |\ \ \ \
| | * | | | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-242-7/+5
| * | | | | Merge branch 'fix-kubernetes-namespace' into 'master'Grzegorz Bizon2017-05-251-12/+12
| |\ \ \ \ \
| | * | | | | Fix terminals support for Kubernetes serviceKamil Trzcinski2017-05-251-12/+12
| * | | | | | Merge branch '17848-web-hook-logging' into 'master'Dmitriy Zaporozhets2017-05-254-44/+18
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Implement web hooks loggingAlexander Randa2017-05-254-44/+18
* | | | | | | Add per deployment additional metricsPawel Chojnacki2017-05-251-0/+10
* | | | | | | Finalize refactoring additional metrics queryPawel Chojnacki2017-05-252-2/+4
* | | | | | | Additional metrics initial work, with working metrics listing, but without ac...Pawel Chojnacki2017-05-252-5/+23
|/ / / / / /
* | | | | | ensure rss token on readAlexis Reigel2017-05-241-1/+8
* | | | | | add rss_token attribute to user modelAlexis Reigel2017-05-241-1/+2
| |/ / / / |/| | | |
* | | | | Merge branch 'dm-outdated-system-note' into 'master'Grzegorz Bizon2017-05-247-29/+39
|\ \ \ \ \
| * | | | | Address reviewDouwe Maan2017-05-242-6/+9
| * | | | | Fix specsdm-outdated-system-noteDouwe Maan2017-05-231-2/+5
| * | | | | Add system note with link to diff comparison when MR discussion becomes outdatedDouwe Maan2017-05-236-31/+35
| | |_|/ / | |/| | |
* | | | | Merge branch 'dm-fix-routes' into 'master'Robert Speicher2017-05-241-1/+1
|\ \ \ \ \
| * | | | | Remove changes that are not absolutely necessarydm-fix-routesDouwe Maan2017-05-232-5/+7
| * | | | | Fix ambiguous routing issues by teaching router about reserved wordsDouwe Maan2017-05-232-7/+5
| | |_|/ / | |/| | |
* | | | | Merge branch 'mrchrisw-catch-openssl' into 'master'Douwe Maan2017-05-242-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Rescue OpenSSL::SSL::SSLError in JiraService and IssueTrackerServicemrchrisw-catch-opensslChris Wilson2017-05-232-2/+2
| | |/ / | |/| |
* | | | Test the ExpireJobCacheWorker and related changeszj-fix-pipeline-etagZ.J. van de Weg2017-05-221-1/+1
* | | | Add MISSING e-tag refresh of resource for Job, and Pipeline GraphKamil Trzcinski2017-05-221-0/+1
| |/ / |/| |
* | | Exclude manual actions from cancelable jobs scopefix/gb/exclude-manual-actions-from-cancelable-jobsGrzegorz Bizon2017-05-191-1/+1
* | | Merge branch 'dm-fix-readme-project-view' into 'master'Dmitriy Zaporozhets2017-05-191-2/+7
|\ \ \
| * | | Remove readme project_view optionDouwe Maan2017-05-191-2/+7
* | | | Merge branch 'dm-render-plain-readme' into 'master'Rémy Coutable2017-05-191-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Render plain README using Markup viewer so it is displayed below treedm-render-plain-readmeDouwe Maan2017-05-181-0/+1
* | | | Merge branch 'dm-no-conflicts-when-branches-are-missing' into 'master'Robert Speicher2017-05-181-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missingDouwe Maan2017-05-181-0/+2
* | | | Merge branch 'dm-gemfile-viewer'Rémy Coutable2017-05-1813-1/+255
|\ \ \ \ | |/ / / |/| | |
| * | | Add auxiliary blob viewers to dependency filesDouwe Maan2017-05-1713-1/+255