summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/refactor-cycle-analytics-stages' into 'master' Douwe Maan2017-01-182-85/+18
|\
| * fix specfix/refactor-cycle-analytics-stagesJames Lopez2017-01-171-1/+1
| * refactored a bunch of stuff based on feedbackJames Lopez2017-01-171-2/+2
| * a few more fixesJames Lopez2017-01-171-1/+1
| * big refactor based on MR feedbackJames Lopez2017-01-171-1/+1
| * few fixes after mergeJames Lopez2017-01-171-1/+3
| * refactor cycle analytics - updated based on MR feedbackJames Lopez2017-01-171-8/+4
| * Fix other spec failuresJames Lopez2017-01-171-4/+7
| * more refactoring and fixing old specsJames Lopez2017-01-171-10/+16
| * fix bad mergeJames Lopez2017-01-171-3/+5
| * added new summary serializers and refactor all of the summary stuff into sepa...James Lopez2017-01-172-44/+1
| * WIP - started refactoring cycle analytics median stuff into stagesJames Lopez2017-01-171-40/+7
* | Merge branch 'time-tracking-api' into 'master' Sean McGivern2017-01-181-9/+23
|\ \
| * | Add some API endpoints for time tracking.Ruben Davila2017-01-181-9/+23
* | | Merge branch '26773-fix-project-statistics-repository-size' into 'master' Rémy Coutable2017-01-181-1/+2
|\ \ \
| * | | Fix Project#update_repository_size to convert MB to Bytes properly26773-fix-project-statistics-repository-sizeOswaldo Ferreira2017-01-171-1/+2
* | | | Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-183-0/+65
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Backport backend work for time tracking.Ruben Davila2017-01-153-0/+65
* | | Merge branch '24915_merge_slash_command' into 'master' Sean McGivern2017-01-171-1/+13
|\ \ \
| * | | support `/merge` slash comand for MRsJarka Kadlecova2017-01-111-1/+13
* | | | Merge branch 'reduce-queries-milestone-index' into 'master' Sean McGivern2017-01-171-2/+5
|\ \ \ \
| * | | | Use cached values to compute total issues count in milestone index pagesreduce-queries-milestone-indexAdam Niedzielski2017-01-101-2/+5
* | | | | Merge branch 'fix/keep-artifacts-button-visibility' into 'master' Sean McGivern2017-01-171-0/+4
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into fix/keep-artifacts-button-visibilityfix/keep-artifacts-button-visibilityGrzegorz Bizon2017-01-1621-171/+219
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Add method that checks for expiring build artifactsGrzegorz Bizon2017-01-091-0/+4
* | | | | | Merge branch 'issue_25017' into 'master' Sean McGivern2017-01-171-10/+10
|\ \ \ \ \ \
| * | | | | | Show 'too many changes' message for merge requestissue_25017Felipe Artur2017-01-121-10/+10
* | | | | | | Mark Commit persistedpmq20/gitlab-ce-psvr/persistedP.S.V.R2017-01-161-0/+8
| |_|/ / / / |/| | | | |
* | | | | | Expire related caches after changing HEADpmq20/gitlab-ce-psvr/head/cacheMinqi Pan2017-01-152-1/+6
| |_|_|_|/ |/| | | |
* | | | | Use string for class_name option for lazy autoload classSemyon Pupkov2017-01-152-3/+3
* | | | | Merge branch 'bug/project-feature-compatibility' into 'master' Douwe Maan2017-01-141-1/+1
|\ \ \ \ \
| * | | | | Mutate the attribute instead of issuing a write operation to the DBbug/project-feature-compatibilityGabriel Mazetto2017-01-121-1/+1
* | | | | | Merge branch 'fix-build-sort-order' into 'master' Robert Speicher2017-01-131-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | rename sort methodMike Greiling2017-01-021-1/+1
| * | | | | add natural sorting token for build namesMike Greiling2017-01-021-0/+6
* | | | | | Merge branch '24185-legacy-ci-status-reactive-cache' into 'security'Robert Speicher2017-01-127-159/+143
* | | | | | Merge branch 'use-configured-git' into 'master' Douwe Maan2017-01-121-1/+1
|\ \ \ \ \ \
| * | | | | | Use configured git rather than system gituse-configured-gitRobert Schilling2017-01-051-1/+1
* | | | | | | Merge branch 'Sanson/gitlab-ce-asciidoctor-plantuml' into 'master' 20450-retry-build-buttonSean McGivern2017-01-121-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-121-0/+6
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | New error message recreating projects on pending deletefix/project-delete-tooltipJames Lopez2017-01-112-0/+30
|/ / / / / /
* | | | | | Merge branch '24139-production-wildcard-for-cycle-analytics' into 'master' Sean McGivern2017-01-101-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Treat environments matching `production/*` as Production24139-production-wildcard-for-cycle-analyticsToon Claes2017-01-091-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'auto-pipelines-vue' into 'master' Fatih Acet2017-01-091-2/+10
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into auto-pipelines-vueRegis2017-01-097-7/+55
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into auto-pipelines-vueFilipa Lacerda2017-01-051-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-0414-35/+28
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | fix pipelines/index.html.haml merge conflictRegis2017-01-0211-35/+134
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'master' into auto-pipelines-vueRegis2016-12-242-3/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge master and fix application.rb conflictRegis2016-12-239-19/+56
| |\ \ \ \ \ \ \
View Lorry Controller Status