summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Refactor Blob support of external storage in preparation of job artifact blobsdm-blob-external-storageDouwe Maan2017-05-034-50/+85
|
* Merge branch '30272-bvl-reject-more-namespaces' into 'master' Douwe Maan2017-05-024-5/+13
|\ | | | | | | | | | | | | Reject more reserved paths Closes #30272 See merge request !10413
| * Refresh the markdown cache if it was `nil`Bob Van Landuyt2017-05-021-0/+3
| | | | | | | | | | If the cached html_field for a markdown_field is `nil` while the mfarkdown_field is not, it needs to be refreshed.
| * Rename `NamespaceValidator` to `DynamicPathValidator`Bob Van Landuyt2017-05-013-3/+3
| | | | | | | | This reflects better that it validates paths instead of a namespace model
| * Use the namespace validator for validating all pathsBob Van Landuyt2017-05-011-1/+1
| | | | | | | | | | Since the namespacevalidator now knows the difference between a top-level and another path, this could all be handled there.
| * Check `has_parent?` for determining validation typeBob Van Landuyt2017-05-011-0/+4
| |
| * Streamline the path validation in groups & projectsBob Van Landuyt2017-05-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | `Project` uses `ProjectPathValidator` which is now a `NamespaceValidator` that skips the format validation. That way we're sure we are using the same collection of reserved paths. I updated the path constraints to reflect the changes: We now allow some values that are only used on a top level namespace as a name for a nested group/project.
* | Merge branch 'gitaly-branch-tag-count' into 'master' Sean McGivern2017-05-021-7/+1
|\ \ | | | | | | | | | | | | | | | | | | Use Gitaly for getting Branch/Tag counts Closes gitaly#157 See merge request !10780
| * | Cleanupgitaly-branch-tag-countKim "BKC" Carlbäcker2017-04-281-3/+1
| | |
| * | Use Gitaly for getting Branch/Tag countsKim "BKC" Carlbäcker2017-04-281-6/+2
| | | | | | | | | | | | | | | | | | - Backup-rake-spec fixed. Storage config broken - Use rugged to compare branch/tag-count in specs - upgrade gitaly
* | | Merge branch '26488-target-disabled-mr' into 'master' Sean McGivern2017-05-022-0/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix 404 when upstream disabled merge requests Closes #26488 See merge request !10427
| * | | Fix 404 when upstream has disabled merge requestsmhasbini2017-04-272-0/+15
| | | |
* | | | Merge branch 'dm-snippet-blob-viewers' into 'master' Sean McGivern2017-05-012-24/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use blob viewers for snippets See merge request !10747
| * | | | Use blob viewers for snippetsDouwe Maan2017-04-302-24/+61
| | |_|/ | |/| |
* | | | Merge branch '30586-fix-gitaly-is-ancestor' into 'master' 31611-sketch43-click-opens-new-tab-and-closes-it-quicklySean McGivern2017-05-011-9/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix Gitaly::Commit#is_ancestor Closes #30586 See merge request !10634
| * | | Fix Gitaly::Commit#is_ancestor30586-fix-gitaly-is-ancestorKim "BKC" Carlbäcker2017-04-281-9/+7
| | | | | | | | | | | | | | | | - Upgrade Gitaly-version
* | | | Merge branch 'dm-video-viewer' into 'master' Sean McGivern2017-04-282-0/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add video blob viewer See merge request !10749
| * | | | Display video blobs in-line like imagesdm-video-viewerDouwe Maan2017-04-282-0/+14
| |/ / /
* | | | Merge branch 'dz-improve-add-users-method' into 'master' Douwe Maan2017-04-281-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Collect all users by single query when using Member#add_users See merge request !10975
| * | | | Collect all users by single query when using Member#add_usersdz-improve-add-users-methodDmitriy Zaporozhets2017-04-281-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch '28020-improve-todo-list-when-comes-from-yourself' into 'master' Sean McGivern2017-04-281-0/+12
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Improve text on todo list when the todo action comes from yourself Closes #28020 See merge request !10594
| * | | | Improve text on todo list when the todo action comes from yourselfJacopo2017-04-281-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved todo message when an issue is assigned to yourself. - The new message when an user assign to himself an issue or a mr is: "You assigned issue xx to yourself" - The new message when an user adds a todo to himself is: "You added a todo for issue xx" - The new message when and user mention himself is: "You mentioned yourself on issue xx" - The new message when an user directly address himself is: "You directly addressed yourself on issue xx" - The new message when an user mark himself as an approver is: "You set yourself as an approver for merge request xx"
* | | | | Add board_move slash commandAlex Sanford2017-04-281-0/+1
| |_|_|/ |/| | |
* | | | Merge branch 'dm-blob-viewers' into 'master' Tim Zallmann2017-04-2819-58/+383
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor rich blob viewers and add Code|Rendered switch Closes #24287 See merge request !10566
| * | | | Fix typoDouwe Maan2017-04-271-1/+1
| | | | |
| * | | | Address feedbackDouwe Maan2017-04-271-9/+12
| | | | |
| * | | | Explain BlobViewer::Base#render_errorDouwe Maan2017-04-272-0/+16
| | | | |
| * | | | Explain how viewers are selected from RICH_VIEWERSDouwe Maan2017-04-272-13/+28
| | | | |
| * | | | Add specsDouwe Maan2017-04-272-5/+5
| | | | |
| * | | | Small code tweaksDouwe Maan2017-04-271-12/+18
| | | | |
| * | | | Set BlobViewer::Base.binary instead of .textDouwe Maan2017-04-2712-17/+17
| | | | |
| * | | | Add BlobViewer::Base#binary? methodDouwe Maan2017-04-272-22/+30
| | | | |
| * | | | Refactor overriding max sizeDouwe Maan2017-04-273-22/+20
| | | | |
| * | | | Address feedbackDouwe Maan2017-04-273-9/+8
| | | | |
| * | | | Add test stubsDouwe Maan2017-04-271-2/+2
| | | | |
| * | | | Download blob viewer is client-sideDouwe Maan2017-04-272-2/+4
| | | | |
| * | | | Add rich blob viewersDouwe Maan2017-04-2711-0/+120
| | | | |
| * | | | Add simple blob viewersDouwe Maan2017-04-275-0/+55
| | | | |
| * | | | Refactor Blob and add BlobViewer::BaseDouwe Maan2017-04-272-56/+151
| | | | |
| * | | | Pass project to BlobDouwe Maan2017-04-273-4/+12
| | |/ / | |/| |
* | | | Merge branch 'dm-fix-ghost-user-validation' into 'master' Robert Speicher2017-04-271-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Skip validation when creating internal (ghost, service desk) users See merge request !10949
| * | | | Skip validation when creating internal (ghost, service desk) usersdm-fix-ghost-user-validationDouwe Maan2017-04-261-1/+3
| | |_|/ | |/| |
* | | | Merge branch '31138-improve-test-settings-for-services-in-empty-projects' ↵Douwe Maan2017-04-272-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' improves test settings for chat notification services for empty projects Closes #31138 See merge request !10886
| * | | improves test settings for chat notification services for empty projects31138-improve-test-settings-for-services-in-empty-projectsTiago Botelho2017-04-272-2/+2
| | | |
* | | | Merge branch 'remove-invalid-services' into 'master' Douwe Maan2017-04-271-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove invalid services with nil or empty type See merge request !10847
| * | | | remove invalid servicesTiago Botelho2017-04-261-0/+1
| | | | |
* | | | | Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-271-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ordering of commits in the network graph. Closes #30973 See merge request !10936
| * | | | | Fix ordering of commits in the network graph.Timothy Andrew2017-04-271-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We upgraded `rugged` to 0.25.1.1 in !10286 for %9.1 - Prior to this upgrade, the default sort order for commits returned by `Gitlab::Git::Repository#find_commits` was `Rugged::SORT_DATE`, which the graph relied on. - While upgrading `rugged`, the MR also changed this default to `Rugged::SORT_NONE`, which broke commit ordering in the graph. - This commit adds an option to `Gitlab::Git::Repository#find_commits` to sort by date, and changes the graph builder `Network::Graph` so it explictly requests the `:date` sort order
* | | | | Merge branch '2246-uuid-is-nil-for-new-installation' into 'master' Sean McGivern2017-04-271-0/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lazily set UUID in ApplicationSetting for new installations Closes gitlab-ee#2246 See merge request !10893
| * | | | | Lazily sets UUID in ApplicationSetting for new installationsDouglas Barbosa Alexandre2017-04-261-0/+9
| | |_|/ / | |/| | |
View Lorry Controller Status