summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'mk-fix-issue-1843' into 'master'Douwe Maan2017-05-182-2/+2
|\ \
| * | Use Namespace.for_user scope (formerly known as Namespace.root)mk-fix-issue-1843Douwe Maan2017-05-182-5/+3
| * | Fixes #32474Michael Kozono2017-05-171-1/+3
| |/
* | Merge branch 'gitaly-local-branches' into 'master'Douwe Maan2017-05-181-15/+1
|\ \
| * | Incorporate Gitaly's local_branches operation into repo codegitaly-local-branchesAlejandro Rodríguez2017-05-171-15/+1
* | | Add auxiliary viewer for READMEdm-readme-viewerDouwe Maan2017-05-173-0/+21
| |/ |/|
* | Add auxiliary blob viewer for CHANGELOGDouwe Maan2017-05-174-2/+21
* | Merge branch 'counters_cache_invalidation' into 'master' Rémy Coutable2017-05-171-1/+9
|\ \
| * | Invalidate cache for issue and MR counters more granularlycounters_cache_invalidationValery Sizov2017-05-151-1/+9
* | | Add auxiliary viewer for CONTRIBUTINGdm-contributing-viewerDouwe Maan2017-05-162-1/+13
* | | Merge branch 'dm-blob-viewer-concerns' into 'master' Robert Speicher2017-05-1610-58/+66
|\ \ \
| * | | Rename BlobViewer max_size to overridable_max_size and absolute_max_size to m...dm-blob-viewer-concernsDouwe Maan2017-05-155-14/+22
| * | | Specify explicitly whether a blob viewer should be loaded asynchronouslyDouwe Maan2017-05-136-42/+42
| * | | Allow blob viewer to support multiple filetypesDouwe Maan2017-05-134-7/+7
* | | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458cDouwe Maan2017-05-164-6/+6
| |_|/ |/| |
* | | Merge branch 'zj-pipeline-schedule-owner' into 'master' Kamil Trzciński2017-05-161-0/+8
|\ \ \
| * | | Do not schedule pipelines if the user can'tZ.J. van de Weg2017-05-151-0/+8
| | |/ | |/|
* | | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'"Douwe Maan2017-05-154-6/+6
* | | Merge branch 'rename-rendered_title' into 'master' Rémy Coutable2017-05-151-1/+1
|\ \ \
| * | | Rename all references to rendered_title to realtime_changesrename-rendered_titleLuke "Jared" Bennett2017-05-131-1/+1
| | |/ | |/|
* | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' Douwe Maan2017-05-154-6/+6
|\ \ \
| * | | Rename `build_events` to `job_events` in codeBob Van Landuyt2017-05-154-6/+6
| | |/ | |/|
* | | Don't reuse gRPC channelsJacob Vosmaer2017-05-151-2/+0
|/ /
* | 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
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |