summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/support-commit-deltas-only-for-gitaly' into 'master' Robert Speicher2017-05-141-2/+10
|\
| * Add support for deltas_only under GitalyAhmad Sherif2017-05-131-2/+10
* | Make the new repository_update_events configurable in System Hooks UIGabriel Mazetto2017-05-121-0/+3
* | Added repository_update hookGabriel Mazetto2017-05-122-0/+3
* | Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master' Douwe Maan2017-05-121-28/+0
|\ \
| * | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-28/+0
* | | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-121-1/+9
|\ \ \
| * | | Allow disabling usage ping in `gitlab.yml`Sean McGivern2017-05-111-1/+9
* | | | Merge branch 'dz-project-list-cache-key' into 'master' Douwe Maan2017-05-121-1/+1
|\ \ \ \
| * | | | Change project list cache key to use route.cache_key instead of namespacedz-project-list-cache-keyDmitriy Zaporozhets2017-05-122-5/+1
| * | | | Add parent full path to project list cache keyDmitriy Zaporozhets2017-05-121-0/+4
* | | | | Merge branch '27439-performance-deltas' into 'master' Douwe Maan2017-05-124-35/+19
|\ \ \ \ \
| * | | | | Keep presentation logic in one place and remove unecessary arguments.Pawel Chojnacki2017-05-112-4/+4
| * | | | | Custom queries for prometheusPawel Chojnacki2017-05-114-34/+18
* | | | | | Consistently use monospace font for commit SHAs and branch and tag namesDouwe Maan2017-05-123-6/+6
* | | | | | Merge branch 'update_assignee_cache_counts_refactoring' into 'master' Sean McGivern2017-05-123-15/+5
|\ \ \ \ \ \
| * | | | | | Move update_assignee_cache_counts to the serviceValery Sizov2017-05-123-15/+5
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'protected-branches-no-one-merge' into 'master' Sean McGivern2017-05-123-28/+22
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Style changes to Ruby fileprotected-branches-no-one-mergePhil Hughes2017-05-121-3/+7
| * | | | | Enabled no-one as a merge access level in protected branchesPhil Hughes2017-05-103-28/+18
* | | | | | Merge branch 'remove-deltas-only' into 'master' Sean McGivern2017-05-121-4/+1
|\ \ \ \ \ \
| * | | | | | Remove deltas_only from DiffCollectionJacob Vosmaer2017-05-111-4/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch '31978-cross-reference-fix' into 'master' Sean McGivern2017-05-121-6/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix cross referencing for private and internal projects31978-cross-reference-fixJarka Kadlecova2017-05-111-6/+7
| |/ / / /
* | | | | Fix displaying a repository without a readmedm-fix-repository-without-readmeDouwe Maan2017-05-111-2/+2
| |_|/ / |/| | |
* | | | Merge branch 'zj-clean-up-ci-variables-table' into 'master' Yorick Peterse2017-05-111-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Remove rails dependent: :destroy statementZ.J. van de Weg2017-05-111-1/+1
| | |/ | |/|
* | | Reset Repository#license memo when license file is changedDouwe Maan2017-05-101-7/+13
* | | Implement auxiliary blob viewersDouwe Maan2017-05-108-22/+147
|/ /
* | Merge branch 'retried-in-database-mysql' into 'master' Regis Boudinot2017-05-102-10/+5
|\ \
| * | Fix rubocop failureKamil Trzcinski2017-05-091-1/+1
| * | Make retried to be nullableKamil Trzcinski2017-05-092-2/+2
| * | Store retried in database for CI buildsretried-in-database-mysqlKamil Trzcinski2017-05-072-10/+5
* | | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'mas...Robert Speicher2017-05-1024-25/+25
|\ \ \
| * | | Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-106-6/+6
| * | | Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-1018-19/+19
| | |/ | |/|
* | | Merge branch 'bvl-security-patches' into 'master' Robert Speicher2017-05-101-13/+0
|\ \ \
| * | | Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-101-13/+0
| |/ /
* | | Merge branch 'dm-async-tree-readme' into 'master' Douwe Maan2017-05-103-5/+15
|\ \ \ | |/ / |/| |
| * | Load tree readme asynchronouslydm-async-tree-readmeDouwe Maan2017-05-103-5/+15
* | | Use relative paths for group/project/user avatarsblackst0ne2017-05-104-16/+33
|/ /
* | Merge branch 'deltas-only' into 'master' Sean McGivern2017-05-091-1/+3
|\ \
| * | Use Rails 'delegate'Jacob Vosmaer2017-05-091-3/+1
| * | Don't make Commit#raw_deltas privateJacob Vosmaer2017-05-091-4/+4
| * | Don't use DiffCollection for deltasJacob Vosmaer2017-05-091-1/+5
* | | Merge branch 'issue_27168_2' into 'master' Sean McGivern2017-05-092-14/+6
|\ \ \
| * | | Fix specs 2Felipe Artur2017-05-081-8/+3
| * | | Add merge requests association to pipelineFelipe Artur2017-05-081-0/+1
| * | | Preloads head pipeline for each merge requestFelipe Artur2017-05-081-6/+2
* | | | Merge branch 'tc-cache-trackable-attributes' into 'master' Douwe Maan2017-05-091-0/+11
|\ \ \ \
View Lorry Controller Status