summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '4457cf9d178dc9912fd9c16427ad81b389179d00' into ↵fix/gb/fix-redundant-pipeline-stagesGrzegorz Bizon2018-02-07170-719/+3234
|\ | | | | | | | | | | | | | | | | fix/gb/fix-redundant-pipeline-stages * commit '4457cf9d178dc9912fd9c16427ad81b389179d00': (76 commits) Conflicts: spec/services/ci/retry_build_service_spec.rb
| * Merge branch 'dm-reset-event-pk-sequence' into 'master'Yorick Peterse2018-02-062-1/+36
| |\ | | | | | | | | | | | | | | | | | | Reset `events` table primary key sequence to make sure it’s correct Closes #42667 See merge request gitlab-org/gitlab-ce!16960
| | * Reset `events` table primary key sequence to make sure it’s correctdm-reset-event-pk-sequenceDouwe Maan2018-02-062-1/+36
| | |
| * | Merge branch '26388-push-to-create-a-new-project' into 'master'Douwe Maan2018-02-0616-134/+581
| |\ \ | | |/ | |/| | | | | | | | | | | | | 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 Maan2018-02-06138-527/+2477
| | |\ | | | | | | | | | | | | # Conflicts: # lib/gitlab/path_regex.rb
| | * | Check ability ability before proceeding with project specific checksTiago Botelho2018-02-064-28/+33
| | | |
| | * | Moves project creationg to git access check for git pushTiago Botelho2018-02-0615-234/+273
| | | |
| | * | Adds documentation for the featureTiago Botelho2018-02-062-2/+44
| | | |
| | * | Abstracts ProjectMoved and ProjectCreated into a BaseProjectTiago Botelho2018-02-0614-158/+141
| | | |
| | * | Move new project on push logic to a serviceTiago Botelho2018-02-0615-144/+186
| | | |
| | * | Add specsTiago Botelho2018-02-0612-45/+224
| | | |
| | * | Adds remote messsage when project is created in a push over SSH or HTTPTiago Botelho2018-02-068-44/+150
| | | |
| | * | Adds option to push over SSH to create a new projectTiago Botelho2018-02-063-7/+20
| | | |
| | * | Adds option to push over HTTP to create a new projectTiago Botelho2018-02-062-6/+44
| | | |
| * | | Merge branch 'dm-git-hook-popen' into 'master'Stan Hu2018-02-061-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 oneDouwe Maan2018-02-061-8/+14
| | | |
| * | | Merge branch 'update-helm-chart-docs' into 'master'Marcia Ramos2018-02-062-11/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Clarify Helm chart plans See merge request gitlab-org/gitlab-ce!16822
| | * | | Fix linksupdate-helm-chart-docsJoshua Lambert2018-02-061-2/+2
| | | | |
| | * | | TyposJoshua Lambert2018-02-061-2/+2
| | | | |
| | * | | Clarify that gitlab-omnibus is the best way to install gitlabJoshua Lambert2018-02-061-1/+1
| | | | |
| | * | | Minor cleanup 2.0Joshua Lambert2018-01-312-2/+2
| | | | |
| | * | | Minor cleanupJoshua Lambert2018-01-312-2/+2
| | | | |
| | * | | Updates to helm chart docsJoshua Lambert2018-01-312-11/+12
| | | | |
| * | | | Merge branch 'dm-route-path-validation' into 'master'Sean McGivern2018-02-0623-126/+53
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Validate user, group and project paths consistently, and only once See merge request gitlab-org/gitlab-ce!16903
| | * | | | Add changelogdm-route-path-validationDouwe Maan2018-02-061-0/+5
| | | | | |
| | * | | | Validate User username only on Namespace, and bubble up appropriatelyDouwe Maan2018-02-0612-90/+23
| | | | | |
| | * | | | Validate path uniqueness only on Route, and bubble up appropriatelyDouwe Maan2018-02-0612-37/+26
| | | | | |
| * | | | | Merge branch 'dm-user-namespace-route-path-validation' into 'master'Sean McGivern2018-02-066-16/+36
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate user namespace before saving so that errors persist on model Closes #42140 See merge request gitlab-org/gitlab-ce!16902
| | * | | | Validate user namespace before saving so that errors persist on modeldm-user-namespace-route-path-validationDouwe Maan2018-02-066-16/+36
| | | | | |
| * | | | | Merge branch 'dm-sidekiq-memory-killer-getcwd' into 'master'Stan Hu2018-02-061-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-getcwdDouwe Maan2018-02-061-1/+1
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'ce-4813-quickfix' into 'master'Sean McGivern2018-02-061-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "spec/ee/spec/services/ee/projects/destroy_service_spec.rb is failing" See merge request gitlab-org/gitlab-ce!16955
| | * | | | | Reset Project's column information in ↵ce-4813-quickfixRémy Coutable2018-02-061-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Merge branch '42730-close-rugged-repository' into 'master'Douwe Maan2018-02-065-1/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "ProjectCacheWorker leaks file descriptors" Closes #42730 See merge request gitlab-org/gitlab-ce!16930
| | * | | | | Close low level rugged repository in project cache workerBastian Blank2018-02-065-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bastian Blank <waldi@debian.org>
| * | | | | | Merge branch 'zj/gitlab-ce-zj-wiki-page-versions'Douwe Maan2018-02-064-19/+75
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into 'zj-wiki-page-versions'Douwe Maan2018-02-061370-12520/+25427
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Gemfile # Gemfile.lock
| | * | | | | | | Allow pagination for WikiVersions on Gitaly requestZeger-Jan van de Weg2018-01-223-43/+19
| | | | | | | | |
| | * | | | | | | Upgrade Gitaly versionsZeger-Jan van de Weg2018-01-221-1/+1
| | | | | | | | |
| | * | | | | | | Client implementation for WikiPageVerionZeger-Jan van de Weg2018-01-224-25/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of gitlab-org/gitaly#639
| * | | | | | | | Merge branch 'gitaly-lfs-client-prep' into 'master'Robert Speicher2018-02-068-92/+81
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-prepAlejandro Rodríguez2018-02-028-92/+81
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'zj-protobuf' into 'master'Marin Jankovski2018-02-064-2/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Downgrade google-protobuf See merge request gitlab-org/gitlab-ce!16941
| | * | | | | | | Downgrade google-protobufZeger-Jan van de Weg2018-02-064-2/+10
| |/ / / / / / /
| * | | | | | | Merge branch '42669-allow-order_by-users-in-gitlab-api' into 'master'Douwe Maan2018-02-064-1/+46
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-apiDmitriy Zaporozhets2018-02-064-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Merge branch 'jej/upload-file-tracks-lfs' into 'master'Sean McGivern2018-02-067-1/+203
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File upload UI obeys LFS filter Closes #29876 See merge request gitlab-org/gitlab-ce!16412
| | * | | | | | | File upload UI obeys LFS filtersJames Edwards-Jones2018-02-067-1/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'winh-kubernetes-clusters' into 'master'Phil Hughes2018-02-0638-192/+262
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace "cluster" with "Kubernetes cluster" Closes #41963 See merge request gitlab-org/gitlab-ce!16778
| | * | | | | | | | Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clustersWinnie Hellmann2018-02-0638-192/+262
| | | | | | | | | |
View Lorry Controller Status