summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dm-fix-readme-project-view' into 'master'Dmitriy Zaporozhets2017-05-191-2/+7
|\ | | | | | | | | Remove readme project_view option See merge request !11425
| * 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 tree See merge request !11510
| * 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 missing Closes #32544 See merge request !11501
| * 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
|\ \ | |/ |/| | | See merge request !11346.
| * 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
|\ \ | | | | | | | | | | | | | | | | | | Fix root groups redirecting to group owner Closes #32474 See merge request !11465
| * | 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
| |/ | | | | | | Older namespace records may be both `type == ‘Group` AND `owner_id` is not null.
* | Merge branch 'gitaly-local-branches' into 'master'Douwe Maan2017-05-181-15/+1
|\ \ | | | | | | | | | | | | | | | | | | Incorporate Gitaly's local_branches operation into repo code Closes #27379 See merge request !10059
| * | 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 separately See merge request !11394
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | Move some blob viewer stuff around without changing behavior See merge request !11358
| * | | Rename BlobViewer max_size to overridable_max_size and absolute_max_size to ↵dm-blob-viewer-concernsDouwe Maan2017-05-155-14/+22
| | | | | | | | | | | | | | | | max_size
| * | | 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
| |_|/ |/| | | | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287
* | | Merge branch 'zj-pipeline-schedule-owner' into 'master' Kamil Trzciński2017-05-161-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Foreign key for Pipeline schedule owner Closes #31932 See merge request !11233
| * | | Do not schedule pipelines if the user can'tZ.J. van de Weg2017-05-151-0/+8
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | When the owner of a pipelines schedule was either blocked or was removed from the project, the pipeline schedular would still schedule the pipeline. This would than fail however, given the user had no access to the project and it contents. However, a better way to handle it would be to not schedule it at all. Furthermore, from now on, such schedules will be deactivated so the schedule worker can ignore it on the next runs.
* | | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'"Douwe Maan2017-05-154-6/+6
| | | | | | | | | This reverts merge request !11287
* | | Merge branch 'rename-rendered_title' into 'master' Rémy Coutable2017-05-151-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Rename all references to rendered_title to realtime_changes See merge request !11359
| * | | 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` Closes #31620 See merge request !11287
| * | | Rename `build_events` to `job_events` in codeBob Van Landuyt2017-05-154-6/+6
| | |/ | |/|
* | | Don't reuse gRPC channelsJacob Vosmaer2017-05-151-2/+0
|/ / | | | | | | | | | | It seems that bad things happen when two gRPC stubs share one gRPC channel so let's stop doing that. The downside of this is that we create more gRPC connections; one per stub.
* | Merge branch 'fix/support-commit-deltas-only-for-gitaly' into 'master' Robert Speicher2017-05-141-2/+10
|\ \ | |/ |/| | | | | | | | | Fetch commit deltas from Gitaly Closes gitaly#199 See merge request !11122
| * Add support for deltas_only under GitalyAhmad Sherif2017-05-131-2/+10
| | | | | | | | Closes gitaly#199
* | 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 upstream Closes gitlab-ee#2128 See merge request !11298
| * | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-reposSean McGivern2017-05-121-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way.
* | | Merge branch 'disable-usage-ping' into 'master'Robert Speicher2017-05-121-1/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Usage ping updates Closes #31741 and #31453 See merge request !11231
| * | | Allow disabling usage ping in `gitlab.yml`Sean McGivern2017-05-111-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting `usage_ping_enabled` to false in `gitlab.yml`: 1. Disables the usage ping, regardless of the value stored in the database. 2. Prevents the usage ping from being enabled through the admin panel. It can only be enabled by either removing the line from `gitlab.yml` and configuring through the admin panel, or setting it to true in `gitlab.yml`.
* | | | Merge branch 'dz-project-list-cache-key' into 'master' Douwe Maan2017-05-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve project list cache key Closes #31863 See merge request !11325
| * | | | Change project list cache key to use route.cache_key instead of namespacedz-project-list-cache-keyDmitriy Zaporozhets2017-05-122-5/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add parent full path to project list cache keyDmitriy Zaporozhets2017-05-121-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch '27439-performance-deltas' into 'master' Douwe Maan2017-05-124-35/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Expose memory deltas between app deployments and refactor prometheus queries to support more custom queries See merge request !10981
| * | | | | Keep presentation logic in one place and remove unecessary arguments.Pawel Chojnacki2017-05-112-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | + fix tests
| * | | | | Custom queries for prometheusPawel Chojnacki2017-05-114-34/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tests for prometheus queries - fix rubocop warnings - Remove unused method. Add more queries to deployment queries. - Wrap BaseQuery in module hierarchy Renname Prometheus class to PrometheusClient
* | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rework update_assignee_cache_counts Closes #31873 See merge request !11270
| * | | | | | 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
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled 'no one' as a merge access level in protected branches Closes #31541 See merge request !11232
| * | | | | Style changes to Ruby fileprotected-branches-no-one-mergePhil Hughes2017-05-121-3/+7
| | | | | |