summaryrefslogtreecommitdiff
path: root/app/services
Commit message (Collapse)AuthorAgeFilesLines
* Set target_branch to the ref branch when creating MR from issue41727-target-branch-nameJarka Kadlecová2018-01-171-0/+1
|
* Fix bug where award emojis would be lost when moving issues between projectssh-fix-award-emoji-move-issuesStan Hu2018-01-101-5/+11
| | | | Closes #33423
* Merge branch '3968-protected-branch-is-not-set-for-default-branch-on-import' ↵Douwe Maan2018-01-082-20/+3
|\ | | | | | | | | | | | | | | | | into 'master' Protected branch is now created for default branch on import Closes #3968 See merge request gitlab-org/gitlab-ce!16198
| * Protected branch is now created for default branch on import3968-protected-branch-is-not-set-for-default-branch-on-importTiago Botelho2018-01-062-20/+3
| |
* | Merge branch 'master' into ↵Matija Čupić2018-01-062-11/+9
|\ \ | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * \ Merge branch '41249-clearing-the-cache' into 'master'Kamil Trzciński2018-01-061-0/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clearing the cache" Closes #41249 See merge request gitlab-org/gitlab-ce!16067
| | * \ Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2018-01-052-0/+54
| | |\ \
| | * \ \ Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2018-01-0412-18/+93
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Rename Project#cache_index to jobs_cache_indexMatija Čupić2018-01-041-1/+1
| | | | |
| | * | | Implement ResetProjectCacheServiceMatija Čupić2017-12-221-0/+1
| | | | |
| | * | | Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2017-12-227-22/+44
| | |\ \ \
| | * | | | Stub ResetProjectCacheServiceMatija Čupić2017-12-211-0/+4
| | | | | |
| * | | | | Move git operations for multi_action into Gitlab::GitAlejandro Rodríguez2018-01-051-11/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into ↵Matija Čupić2018-01-052-0/+54
|\ \ \ \ \ | |/ / / / | | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * | | | Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-052-0/+54
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
* | | | Return list of billing enabled projectsMatija Čupić2018-01-051-1/+1
| | | |
* | | | Merge branch 'master' into ↵Matija Čupić2018-01-0515-20/+99
|\ \ \ \ | |/ / / | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * | | Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-046-4/+58
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Improve closed/merged events queries performance on Projects::MergeRequestsController#show.json See merge request gitlab-org/gitlab-ce!15642
| | * | | Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-026-4/+58
| | | | |
| * | | | Use if instead of unless on Projects::HashedStorage::MigrateRepositoryServiceda-handle-hashed-storage-repos-using-repo-import-taskDouglas Barbosa Alexandre2018-01-031-3/+3
| | | | |
| * | | | Fix Projects::TransferService#write_repository_config methodDouglas Barbosa Alexandre2018-01-031-1/+1
| | | | |
| * | | | Refactoring Project#write_repository_configDouglas Barbosa Alexandre2018-01-033-16/+4
| | | | |
| * | | | Does not write to .git/config when importing bare repositoriesDouglas Barbosa Alexandre2018-01-031-5/+5
| | | | |
| * | | | Write project full path to .git/config when migrating legacy storageDouglas Barbosa Alexandre2018-01-031-0/+7
| | | | |
| * | | | Update project full path in .git/config when transfering a projectDouglas Barbosa Alexandre2018-01-031-0/+10
| | | | |
| * | | | Write project full path to .git/config when creating projectsDouglas Barbosa Alexandre2018-01-031-0/+5
| | | | | | | | | | | | | | | | | | | | We'd need to keep track of project full path otherwise directory tree created with hashed storage enabled cannot be usefully imported using the import rake task.
| * | | | Merge branch '41424-gitlab-rake-gitlab-import-repos-schedules-an-import' ↵Douwe Maan2018-01-031-5/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "gitlab-rake gitlab:import:repos schedules an import" Closes #41424 See merge request gitlab-org/gitlab-ce!16115
| | * | | | refactor project create service41424-gitlab-rake-gitlab-import-repos-schedules-an-importJames Lopez2018-01-031-2/+2
| | | | | |
| | * | | | refactor code to use new import typeJames Lopez2018-01-031-4/+3
| | | | | |
| | * | | | fix missing create services callJames Lopez2018-01-021-1/+1
| | | | | |
| | * | | | fix branch complexityJames Lopez2018-01-021-5/+11
| | | | | |
| | * | | | Fix import scheduled on bare repo importJames Lopez2018-01-021-1/+2
| | | |_|/ | | |/| |
| * | | | Merge branch 'gitaly-conflict-resolver' into 'master'Grzegorz Bizon2018-01-031-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Gitaly conflict resolver Closes gitaly#813 See merge request gitlab-org/gitlab-ce!15755
| | * | | Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez2017-12-271-1/+1
| | |/ /
| * | | Merge branch 'fj-40053-error-500-members-list' into 'master'Douwe Maan2018-01-021-0/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix user membership destroy relation Closes #40053 See merge request gitlab-org/gitlab-ce!15970
| | * | | Fix user membership destroy relationFrancisco Javier López2018-01-021-0/+5
| | |/ /
| * | | Forking a project to a namespace with lower visibility.bvl-fork-public-project-to-private-namespaceBob Van Landuyt2017-12-291-7/+7
| |/ / | | | | | | | | | | | | | | | | | | In this case the project will get the minimum between both visibilities. If that visibility is restricted, then a lower level will be picked.
| * | Extend Cluster Applications to allow installation of PrometheusMayra Cabrera2017-12-221-1/+1
| | |
| * | Skip projects filter on merge requests searchjprovazn-searchJan Provaznik2017-12-212-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When searching for merge requests, an additional subquery is added which by default filters only merge requests which belong to source or target project user has permission for. This filter is not needed because more restrictive filter which checks if user has permission for target project is used in the query. So unless a custom projects filter is used by user, it's possible to skip the default projects filter and speed up the final query. Related to #40540
* | | Merge branch 'master' into ↵Matija Čupić2017-12-2112-37/+75
|\ \ \ | |/ / | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * | Merge branch '38356-add-last_commit_sha-to-the-commit-api' into 'master'Douwe Maan2017-12-214-20/+38
| |\ \ | | |/ | |/| | | | | | | | | | | | | Add new last_commit_id param for create commit endpoint Closes #38356 See merge request gitlab-org/gitlab-ce!15922
| | * Updates from last code review:38356-add-last_commit_sha-to-the-commit-apiRubén Dávila2017-12-204-27/+33
| | | | | | | | | | | | | | | | | | - Apply some refactoring for code reuse - Add file status validation for Files::DeleteService - Write additional specs
| | * Check if file has been modified for each action provided.Rubén Dávila2017-12-201-0/+12
| | | | | | | | | | | | | | | | | | When commiting multiple files we're now checking if any of those files has been modified by another commit and we're rejecting the new commit in this case.
| * | Merge branch 'rs-blocks-json-serialization' into 'master'Douwe Maan2017-12-201-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add BlocksJsonSerialization model concern and include it in User Closes #37947 See merge request gitlab-org/gitlab-ce!14350
| | * | Only include the user's ID in the time_spent command's update hashRobert Speicher2017-12-191-2/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Previously, this would include the entire User record in the update hash, which was rendered in the response using `to_json`, erroneously exposing every attribute of that record, including their (now removed) private token. Now we only include the user ID, and perform the lookup on-demand.
| * | Don't link LFS-objects multiple times.bvl-fix-unlinking-with-lfs-objectsBob Van Landuyt2017-12-191-1/+1
| |/ | | | | | | | | | | If Unlinking a fork would fail somewhere after this, the LFS objects might still be linked. Which would cause issues when trying to destroy a project.
| * Merge branch ↵Douwe Maan2017-12-183-7/+19
| |\ | | | | | | | | | | | | | | | | | | | | | | | | '40871-todo-notification-count-shows-notification-without-having-a-todo' into 'master' Resolve "Todo notification count shows notification without having a todo" Closes #40871 See merge request gitlab-org/gitlab-ce!15807
| | * Reset todo counters when the target is deleted40871-todo-notification-count-shows-notification-without-having-a-todoSean McGivern2017-12-183-7/+19
| | | | | | | | | | | | | | | | | | When the target is deleted, todos are destroyed, but we did not reset the todo cache for users with todos on the deleted target. This would only update after the next time the todo cache was updated for that user.
| * | Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-1527-95/+326
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (671 commits) Make rubocop happy Use guard clause Improve language Prettify Use temp branch Pass info about who started the job and which job triggered it Docs: add indexes for monitoring and performance monitoring clearer-documentation-on-inline-diffs Add docs for commit diff discussion in merge requests sorting for tags api Clear BatchLoader after each spec to prevent holding onto records longer than necessary Include project in BatchLoader key to prevent returning blobs for the wrong project moved lfs_blob_ids method into ExtractsPath module Converted JS modules into exported modules spec fixes Bump gitlab-shell version to 5.10.3 Clear caches before updating MR diffs Use new Ruby version 2.4 in GitLab QA images moved lfs blob fetch from extractspath file Update GitLab QA dependencies ...
| | * \ Merge branch 'issue_41021' into 'master'Sean McGivern2017-12-131-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent worker that updates merge requests head pipeline from failing jobs Closes #41021 See merge request gitlab-org/gitlab-ce!15870
View Lorry Controller Status