summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'osw-stop-recalculating-merge-base-on-mr-loading' into 'master'Sean McGivern2018-03-121-1/+5
|\ | | | | | | | | Avoid re-fetching merge-base SHA from Gitaly unnecessarily See merge request gitlab-org/gitlab-ce!17630
| * Avoid re-fetching merge-base SHA from Gitaly unnecessarilyOswaldo Ferreira2018-03-071-1/+5
| |
* | Fix code and wiki search results when filename is non-ASCIISean McGivern2018-03-121-2/+2
| | | | | | | | | | Previously, we only handled non-ASCII file contents, but the name itself can be non-ASCII.
* | Merge branch 'osw-43951-single-batch-blob-request-to-gitaly' into 'master'Sean McGivern2018-03-091-8/+10
|\ \ | | | | | | | | | | | | | | | | | | Submit a single batch blob RPC to Gitaly per HTTP request when viewing diffs Closes #43951 See merge request gitlab-org/gitlab-ce!17659
| * | Submit a single batch blob RPC to Gitaly per HTTP request when viewing diffsOswaldo Ferreira2018-03-091-8/+10
| | |
* | | Add rake task to cleanup any existing exclusive leaseGabriel Mazetto2018-03-091-0/+10
| | |
* | | Merge branch 'jprovazn-commits-count-reschedule' into 'master'Yorick Peterse2018-03-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Reschedule commits_count background migration See merge request gitlab-org/gitlab-ce!17599
| * | | Reschedule commits_count background migrationjprovazn-commits-count-rescheduleJan Provaznik2018-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We still have >100K unmigrated MergeRequestDiffs which don't have commits_count set yet (see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17567#note_61904891) This migration re-schedules the original background migration. To assure that records are not processed twice, records with commits_count set are skipped. Related to #41698 and !17567
* | | | Merge branch 'cache-refactor' into 'master'Sean McGivern2018-03-093-2/+147
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache `#can_be_resolved_in_ui?` git operations Closes gitaly#1051 See merge request gitlab-org/gitlab-ce!17589
| * | | | Cache `#can_be_resolved_in_ui?` git operationscache-refactorAlejandro Rodríguez2018-03-082-3/+32
| | | | |
| * | | | Refactor RepositoryCache to make it usable in other classesAlejandro Rodríguez2018-03-062-0/+116
| | | | |
* | | | | Merge branch '43949-verify-job-artifacts' into 'master'Sean McGivern2018-03-091-0/+27
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve "Foreground verification of job artifacts" Closes #43949 See merge request gitlab-org/gitlab-ce!17578
| * | | | Implement foreground verification of CI artifacts43949-verify-job-artifactsNick Thomas2018-03-071-0/+27
| | | | |
* | | | | Merge branch 'gitaly-fsck-mandatory' into 'master'Douwe Maan2018-03-081-16/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Make 'git fsck' mandatory See merge request gitlab-org/gitlab-ce!17648
| * | | | Make 'git fsck' mandatorygitaly-fsck-mandatoryKim "BKC" Carlbäcker2018-03-081-16/+2
| | |_|/ | |/| |
* | | | Merge branch 'gitlab-git-duplicate-code' into 'master'Sean McGivern2018-03-081-18/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove duplicate method definitions See merge request gitlab-org/gitlab-ce!17478
| * | | | Remove duplicate method definitionsJacob Vosmaer2018-03-081-18/+0
| |/ / /
* | | | Merge branch 'jprovazn-revert-commit-cleanup' into 'master'Sean McGivern2018-03-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Cleanup after adding MR diff's commit_count" See merge request gitlab-org/gitlab-ce!17639
| * | | | Revert "Cleanup after adding MR diff's commit_count"Jan Provaznik2018-03-081-1/+1
| |/ / / | | | | | | | | | | | | This reverts commit 0b7d10851456018328da137beeca931767b4fd0a.
* | | | [CE] Add Naming/FileName rule checking expected class/module per filenameGabriel Mazetto2018-03-086-6/+6
|/ / /
* | | Merge branch 'ce-jej/github-project-service-for-ci' into 'master'Douwe Maan2018-03-081-0/+1
|\ \ \ | | | | | | | | | | | | | | | | Backport changes from introducing GithubService interation in EE See merge request gitlab-org/gitlab-ce!17607
| * | | Backport changes from EE's GithubService integrationJames Edwards-Jones2018-03-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Adds detailed_status to pipeline hook data Adds detailed_description option for Services Integration edit page renders 404 if a service is disabled
* | | | Validate `:push_code` before checking protected branchesbvl-port-ee-improvements-from-maintainer-pushBob Van Landuyt2018-03-081-6/+3
| | | |
* | | | Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-feDouwe Maan2018-03-078-28/+21
|\ \ \ \ | | | | | | | | | | | | | | | # Conflicts: # locale/gitlab.pot
| * \ \ \ Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-072-2/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow maintainers to push forks of a project for branches that have open MRs Closes #22292 See merge request gitlab-org/gitlab-ce!17395
| | * | | | Limit queries to a user-branch combinationBob Van Landuyt2018-03-072-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The query becomes a lot simpler if we can check the branch name as well instead of having to load all branch names.
| | * | | | Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-071-1/+1
| | | | | |
| | * | | | Allow maintainers to push to a single branchBob Van Landuyt2018-03-071-1/+5
| | | | | |
| * | | | | Merge branch 'fix/reduce-number-of-find-commit-for-log-tree' into 'master'Robert Speicher2018-03-071-4/+4
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce number of FindCommit calls from RefsController#logs_tree Closes gitaly#1057 See merge request gitlab-org/gitlab-ce!17566
| | * | | | Reduce number of FindCommit calls from RefsController#logs_treefix/reduce-number-of-find-commit-for-log-treeAhmad Sherif2018-03-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitaly#1057 The old code was calling LastCommitForPath to extract a commit ID _then_ call FindCommit to get a commit it already had in the first place!
| * | | | | Merge branch 'dz-use-less-deprecated-methods-2' into 'master'Douwe Maan2018-03-074-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Project#full_name instead of name_with_namespace See merge request gitlab-org/gitlab-ce!17601
| | * | | | | Use Project#full_name instead of name_with_namespaceDmitriy Zaporozhets2018-03-074-4/+4
| | | |/ / / | | |/| | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Merge branch 'gitaly-git-mandatory' into 'master'Douwe Maan2018-03-071-18/+4
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | Make git push mandatory See merge request gitlab-org/gitlab-ce!17565
| | * | | | naming thingsKim "BKC" Carlbäcker2018-03-071-2/+2
| | | | | |
| | * | | | Make git push mandatoryKim "BKC" Carlbäcker2018-03-061-18/+4
| | | |/ / | | |/| |
* | | | | CE backport for creating CI/CD projects from GitHubRubén Dávila2018-03-071-4/+5
|/ / / /
* | | | Merge branch 'zj-move-opt-out-ruby-endpoints' into 'master'Sean McGivern2018-03-072-9/+9
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Move Ruby endpoints to OPT_OUT See merge request gitlab-org/gitlab-ce!17561
| * | | Move OperationService#UserRemoveBranchZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | Part of: gitlab-org/gitaly#476
| * | | Move OperationService#UserCreateBranchZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | Part of: gitlab-org/gitaly#476
| * | | Move CommitService#Languages to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | Part of: gitlab-org/gitlab-ce!17561
| * | | Move RefService#CreateBranch to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | Part of: gitlab-org/gitaly#540
| * | | Move RefService#DeleteBranch to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | Part of: gitlab-org/gitaly#546
| * | | Move OperationService#UserRevert to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | Part of: gitlab-org/gitaly#779
| * | | Move OperationService#UserAddTag to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | Part of: gitlab-org/gitaly#541
| * | | Move CommitService::CommitPatch to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | Part of gitlab-org/gitaly#324
| * | | Move Repository#HasLocalBranches to OPT_OUTZeger-Jan van de Weg2018-03-071-1/+1
| | | | | | | | | | | | | | | | Part of gitlab-org/gitaly#616
* | | | Count discussions on issues and merge requests as contributions for the ↵Riccardo Padovani2018-03-071-1/+1
| | | | | | | | | | | | | | | | contributions calendar
* | | | Merge branch 'master' into 'master'Grzegorz Bizon2018-03-071-6/+9
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | CI charts now include the current day Closes #42921 See merge request gitlab-org/gitlab-ce!17032
| * | | CI charts now include the current dayDakkaron2018-03-061-6/+9
| | | |
* | | | Merge branch 'sh-make-prune-optional-in-git-fetch' into 'master'43962-add-wip-to-merge-requests-titles-by-default43958-include-adding-a-specific-runner-to-another-project-from-the-admin-area-to-docsNick Thomas2018-03-073-9/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make --prune a configurable parameter in fetching a git remote See merge request gitlab-org/gitlab-ce!17346
View Lorry Controller Status