summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'backport-fix-load-error' into 'master'"Stan Hu2017-01-211-48/+44
* Don't define ApplicationSetting defaults in a constantbackport-fix-load-errorRémy Coutable2017-01-201-44/+48
* Merge branch 'fix-shared-runners-queue-update' into 'master' 26636-multiple-requests-to-ci_status-endpoints-at-the-same-timeRémy Coutable2017-01-201-3/+5
|\
| * Improve readability of runner tick queue methodGrzegorz Bizon2017-01-201-3/+5
* | Merge branch 'dont-persist-application-settings-in-test-env' into 'master' Robert Speicher2017-01-201-40/+44
|\ \
| * | Move default values to ApplicationSetting::DEFAULTS and use it in CurrentSett...Rémy Coutable2017-01-151-40/+44
* | | Record used SSH keys only once per dayrecord-used-ssh-keys-once-per-dayAdam Niedzielski2017-01-201-1/+6
| |/ |/|
* | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-197-1/+40
|\ \
| * \ Merge branch 'wip-mr-from-commits' into 'master' Sean McGivern2017-01-191-0/+6
| |\ \
| | * | Mark MR as WIP when pushing WIP commitsjurre2017-01-191-0/+6
| * | | Merge branch '23563-document-presenters' into 'master' Dmitriy Zaporozhets2017-01-192-0/+8
| |\ \ \
| | * | | Add Presentable concernRémy Coutable2017-01-182-0/+8
| * | | | Merge branch 'fix/external-status-badge-links' into 'master' Kamil Trzciński2017-01-191-0/+10
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add URL validations for generic commit statusesGrzegorz Bizon2017-01-181-0/+4
| | * | | Link external commit status badge to a target URLGrzegorz Bizon2017-01-171-0/+6
| * | | | Merge branch '23524-notify-automerge-user-of-failed-build' into 'master' Sean McGivern2017-01-192-1/+11
| |\ \ \ \
| | * | | | Notify the user who set auto-merge when merge conflict occurstwonegatives2017-01-142-1/+11
| * | | | | Merge branch 'speed-up-dashboard-milestone-index' into 'master' Sean McGivern2017-01-191-0/+5
| |\ \ \ \ \
| | * | | | | Speed up dashboard milestone index by scoping IssuesFinder to user authorized...speed-up-dashboard-milestone-indexAdam Niedzielski2017-01-161-0/+5
| | | |/ / / | | |/| | |
* | | | | | Fix specsKamil Trzcinski2017-01-191-3/+9
* | | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-1972-670/+1524
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | |_|_|_|/ / / | |/| | | | | |