Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '26388-push-to-create-a-new-project' into 'master' | Douwe Maan | 2018-02-06 | 8 | -67/+188 |
|\ | | | | | | | | | | | | | Resolve "Push to create a new project" Closes #26388 See merge request gitlab-org/gitlab-ce!16547 | ||||
| * | Merge branch 'master' into '26388-push-to-create-a-new-project' | Douwe Maan | 2018-02-06 | 16 | -81/+176 |
| |\ | | | | | | | | | | # Conflicts: # lib/gitlab/path_regex.rb | ||||
| * | | Check ability ability before proceeding with project specific checks | Tiago Botelho | 2018-02-06 | 1 | -18/+23 |
| | | | |||||
| * | | Moves project creationg to git access check for git push | Tiago Botelho | 2018-02-06 | 8 | -66/+78 |
| | | | |||||
| * | | Adds documentation for the feature | Tiago Botelho | 2018-02-06 | 1 | -2/+6 |
| | | | |||||
| * | | Abstracts ProjectMoved and ProjectCreated into a BaseProject | Tiago Botelho | 2018-02-06 | 7 | -92/+79 |
| | | | |||||
| * | | Move new project on push logic to a service | Tiago Botelho | 2018-02-06 | 6 | -52/+40 |
| | | | |||||
| * | | Add specs | Tiago Botelho | 2018-02-06 | 4 | -19/+20 |
| | | | |||||
| * | | Adds remote messsage when project is created in a push over SSH or HTTP | Tiago Botelho | 2018-02-06 | 5 | -20/+112 |
| | | | |||||
| * | | Adds option to push over SSH to create a new project | Tiago Botelho | 2018-02-06 | 2 | -2/+15 |
| | | | |||||
| * | | Adds option to push over HTTP to create a new project | Tiago Botelho | 2018-02-06 | 1 | -5/+24 |
| | | | |||||
* | | | Merge branch 'dm-git-hook-popen' into 'master' | Stan Hu | 2018-02-06 | 1 | -8/+14 |
|\ \ \ | |_|/ |/| | | | | | | | | Only set cwd on the newly spawned process, instead of the current one See merge request gitlab-org/gitlab-ce!16958 | ||||
| * | | Only set cwd on the newly spawned process, instead of the current one | Douwe Maan | 2018-02-06 | 1 | -8/+14 |
| | | | |||||
* | | | Merge branch 'dm-route-path-validation' into 'master' | Sean McGivern | 2018-02-06 | 3 | -14/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | Validate user, group and project paths consistently, and only once See merge request gitlab-org/gitlab-ce!16903 | ||||
| * | | | Validate User username only on Namespace, and bubble up appropriately | Douwe Maan | 2018-02-06 | 3 | -14/+2 |
| | | | | |||||
* | | | | Merge branch 'dm-sidekiq-memory-killer-getcwd' into 'master' | Stan Hu | 2018-02-06 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd See merge request gitlab-org/gitlab-ce!16954 | ||||
| * | | | | Explicitly set cwd in Sidekiq memory killer instead of depending on getcwddm-sidekiq-memory-killer-getcwd | Douwe Maan | 2018-02-06 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch '42730-close-rugged-repository' into 'master' | Douwe Maan | 2018-02-06 | 1 | -0/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "ProjectCacheWorker leaks file descriptors" Closes #42730 See merge request gitlab-org/gitlab-ce!16930 | ||||
| * | | | | Close low level rugged repository in project cache worker | Bastian Blank | 2018-02-06 | 1 | -0/+4 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Bastian Blank <waldi@debian.org> | ||||
* | | | | Merge branch 'zj/gitlab-ce-zj-wiki-page-versions' | Douwe Maan | 2018-02-06 | 2 | -9/+49 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into 'zj-wiki-page-versions' | Douwe Maan | 2018-02-06 | 164 | -939/+2527 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Gemfile # Gemfile.lock | ||||
| * | | | | | Allow pagination for WikiVersions on Gitaly request | Zeger-Jan van de Weg | 2018-01-22 | 2 | -41/+17 |
| | | | | | | |||||
| * | | | | | Client implementation for WikiPageVerion | Zeger-Jan van de Weg | 2018-01-22 | 2 | -15/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | Part of gitlab-org/gitaly#639 | ||||
* | | | | | | Merge branch 'gitaly-lfs-client-prep' into 'master' | Robert Speicher | 2018-02-06 | 5 | -54/+50 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Gitlab::Git code related to LFS changes for Gitaly migration Closes gitaly#980 See merge request gitlab-org/gitlab-ce!16835 | ||||
| * | | | | | Refactor Gitlab::Git code related to LFS changes for Gitaly migrationgitaly-lfs-client-prep | Alejandro Rodríguez | 2018-02-02 | 5 | -54/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We stop relying on Gitlab::Git::Env for the RevList class, and use Gitlab::Git::Repository#run_git methods inteaad. The refactor also fixes another issue, since we now top using "path_to_repo" (which is a Repository model method). | ||||
* | | | | | | Merge branch '42669-allow-order_by-users-in-gitlab-api' into 'master' | Douwe Maan | 2018-02-06 | 1 | -1/+18 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sorting options for /users API Closes #42669 See merge request gitlab-org/gitlab-ce!16945 | ||||
| * | | | | | | Add sorting options for /users API (admin only)42669-allow-order_by-users-in-gitlab-api | Dmitriy Zaporozhets | 2018-02-06 | 1 | -1/+18 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | Merge branch 'jej/upload-file-tracks-lfs' into 'master' | Sean McGivern | 2018-02-06 | 2 | -0/+30 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File upload UI obeys LFS filter Closes #29876 See merge request gitlab-org/gitlab-ce!16412 | ||||
| * | | | | | File upload UI obeys LFS filters | James Edwards-Jones | 2018-02-06 | 2 | -0/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses Lfs::FileModificationHandler to coordinate LFS detection, creation of LfsObject, etc Caveats: 1. This isn't used by the multi-file editor / Web IDE 2. This isn't used on rename. We'd need to be able to download LFS files and add them to the commit if they no longer match so not as simple. 3. We only check the root .gitattributes file, so this should be improved to correctly check for nested .gitattributes files in subfolders. | ||||
* | | | | | | Merge branch 'bump-workhorse' into 'master' | Nick Thomas | 2018-02-06 | 1 | -0/+12 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade GitLab Workhorse to v3.6.0 See merge request gitlab-org/gitlab-ce!16946 | ||||
| * | | | | | | Upgrade GitLab Workhorse to v3.6.0 | Kamil Trzciński | 2018-02-06 | 1 | -0/+12 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Rename CreateArtifactsTraceService to CreateTraceArtifactService | Shinya Maeda | 2018-02-06 | 1 | -8/+0 |
| | | | | | | |||||
* | | | | | | Revert live-trace path | Shinya Maeda | 2018-02-06 | 1 | -24/+12 |
| | | | | | | |||||
* | | | | | | Add CreateArtifactsTraceWorker | Shinya Maeda | 2018-02-06 | 2 | -16/+7 |
| | | | | | | |||||
* | | | | | | Expose current_path | Shinya Maeda | 2018-02-06 | 1 | -6/+6 |
| | | | | | | |||||
* | | | | | | Check existance of the file when trace_artifact is read | Shinya Maeda | 2018-02-06 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Move default_path to legacy_default_path. Switch to the new path for live-trace | Shinya Maeda | 2018-02-06 | 1 | -10/+28 |
| | | | | | | |||||
* | | | | | | Remove unnecessary changes | Shinya Maeda | 2018-02-06 | 1 | -6/+10 |
| | | | | | | |||||
* | | | | | | Trace as artifacts | Shinya Maeda | 2018-02-06 | 2 | -9/+24 |
|/ / / / / | |||||
* | | | | | Added ldap config setting to lower case usernames | Francisco Javier López | 2018-02-05 | 3 | -1/+13 |
| |_|_|/ |/| | | | |||||
* | | | | Allow moving wiki pages from the UI | Francisco Javier López | 2018-02-05 | 1 | -5/+19 |
| | | | | |||||
* | | | | Merge branch 'fix/gitaly-wiki-encoding-issues' into 'master' | Robert Speicher | 2018-02-05 | 1 | -0/+5 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Encode GitalyClient::WikiPage attributes to UTF-8 See merge request gitlab-org/gitlab-ce!16925 | ||||
| * | | | | Encode GitalyClient::WikiPage attributes to UTF-8fix/gitaly-wiki-encoding-issues | Ahmad Sherif | 2018-02-05 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | Merge branch '42547-upload-store-mount-point' into 'master' | Sean McGivern | 2018-02-05 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store uploader context in uploads Closes #42547 See merge request gitlab-org/gitlab-ce!16779 | ||||
| * | | | | | add the uploader context to the upload model | Micaël Bergeron | 2018-02-02 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Enable Prometheus metrics for deployed Ingresses | Joshua Lambert | 2018-02-05 | 1 | -2/+6 |
| | | | | | | |||||
* | | | | | | Merge branch 'api-guard' into 'master' | Rémy Coutable | 2018-02-05 | 1 | -1/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make find_user_from_sources extensible for EE See merge request gitlab-org/gitlab-ce!16924 | ||||
| * | | | | | | Make find_user_from_sources extensible for EE | Lin Jen-Shin | 2018-02-05 | 1 | -1/+5 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'gitaly-user-squash' into 'master' | Rémy Coutable | 2018-02-05 | 2 | -26/+63 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate OperationService.UserSquash Gitaly RPC Closes gitaly#991 See merge request gitlab-org/gitlab-ce!16899 | ||||
| * | | | | | | Incorporate OperationService.UserSquash Gitaly RPCgitaly-user-squash | Alejandro Rodríguez | 2018-02-02 | 2 | -26/+63 |
| | | | | | | |