summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Return a warning string if we try to encode to unsupported encodingAhmad Sherif2018-02-091-3/+3
| |_|_|/ |/| | | | | | | | | | | Fixes gitlab-development-kit#321
* | | | Remove allow_n_plus_1 from Git::Repository#branches_filterAhmad Sherif2018-02-081-11/+8
| | | |
* | | | Merge branch 'bvl-fix-concurrent-fork-network-migrations' into 'master'42861-include-external-files-in-gitlab-ci-yml-move-from-eep-to-ceYorick Peterse2018-02-081-4/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix concurrent fork network migrations Closes #41487 See merge request gitlab-org/gitlab-ce!16988
| * | | | Handle uniqueness on fork_network_member creationBob Van Landuyt2018-02-081-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the migration might be queued already and be rescheduled when it fails on a uniqueness error, this should help clearing the background migration queue faster.
* | | | | Merge branch 'zj-namespace-gitaly-opt-out' into 'master'Sean McGivern2018-02-081-4/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Move Namespace to Gitaly using OPT-OUT See merge request gitlab-org/gitlab-ce!15910
| * | | | Move Namespace to Gitaly using OPT-OUTZeger-Jan van de Weg2017-12-131-4/+8
| | | | |
* | | | | Migrate Git::Blob.batch to GitalyAhmad Sherif2018-02-083-5/+74
| | | | | | | | | | | | | | | | | | | | Closes gitaly#985
* | | | | Merge branch 'fix/cache-gitaly-find-commits' into 'master'Sean McGivern2018-02-071-8/+30
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cache Gitaly FindCommit RPC response See merge request gitlab-org/gitlab-ce!16949
| * | | | | Cache Gitaly FindCommit RPC responsefix/cache-gitaly-find-commitsAhmad Sherif2018-02-071-8/+30
| | | | | |
* | | | | | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-073-26/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy prometheus through kubernetes and autoconnect to cluster Closes #30480 and #28916 See merge request gitlab-org/gitlab-ce!16182
| * | | | | | Catch json parsing error as PrometheusErrorpawel/connect_to_prometheus_through_proxy-30480Pawel Chojnacki2018-02-071-0/+2
| | | | | | |
| * | | | | | Make prometheus service querying approach much nicer wrt to arity and ↵Pawel Chojnacki2018-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | default function params
| * | | | | | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-0672-309/+704
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (242 commits) Validate user namespace before saving so that errors persist on model Reset Project's column information in spec/lib/gitlab/background_migration/populate_merge_request_metrics_with_events_data_spec.rb Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd Downgrade google-protobuf Close low level rugged repository in project cache worker File upload UI obeys LFS filters Resolve "Add a link to documentation on how to get external ip in the Kubernetes cluster details page" Upgrade GitLab Workhorse to v3.6.0 Add sorting options for /users API (admin only) improvements from feedback [ci-skip] add changelog remove file after `Upload#destroy` Fix a hardcoded pipeline ID in a spinach step Override group sidebar links Replace "cluster" with "Kubernetes cluster" Reorder async/sync tasks in BuildFinishedWorker to read traces efficiently Fix tests for Drop filename enforcement Revert using expand_fixture_path in factory Revert "Add FixtureHelpers for FactoryGirl" Refactor :trace to :trace_live in spec ...
| * \ \ \ \ \ \ Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-3128-375/+895
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (119 commits) [ci skip] Fix example commands to refer to the correct versions Use axios instead of jquery ajax for setCiStatusFavicon refactor groups controller to match EE Fix broken test Introduce a new QA::Gitlab::Page::Component::Dropzone class Gitaly Server info for admin panel Add note about being in the `qa` directory for `bin/qa` to work Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints Fix not all events being shown in group dashboard Add support for PreReceiveError in UserMergeBranch RPC Migrate Git::Repository#delete_refs to Gitaly Replace $.get in render math with axios Move mr widget related links into a vue file Make those files as close as EE to reduce conflicts Don't assume postgresql in two initializers Move Repository#can_be_merged? to Gitlab::Git::Repository Remove brakeman from .codeclimate.yml since it's now covered by the sast CI job Update Nokogiri to 1.8.2 Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck Remove Rugged exception in cache rescue ...
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2018-01-2946-237/+987
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | pawel/connect_to_prometheus_through_proxy-30480
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Pawel Chojnacki2018-01-1786-409/+1825
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pawel/connect_to_prometheus_through_proxy-30480
| * | | | | | | | | Cleanup PrometheusService testsPawel Chojnacki2018-01-041-12/+14
| | | | | | | | | |
| * | | | | | | | | Cleanup implementation and add cluster finding testsPawel Chojnacki2018-01-041-1/+1
| | | | | | | | | |
| * | | | | | | | | Fix prometheus client testsPawel Chojnacki2018-01-041-4/+13
| | | | | | | | | |
| * | | | | | | | | Add test checking if prometheus integration is enabled after prometheus is ↵Pawel Chojnacki2018-01-042-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | installed
| * | | | | | | | | Move client creation to Prometheus Application, manufacture proper rest clientPawel Chojnacki2018-01-021-10/+4
| | | | | | | | | |
| * | | | | | | | | wipPawel Chojnacki2018-01-023-21/+19
| | | | | | | | | |
* | | | | | | | | | Removing gitaly flagsFrancisco Javier López2018-02-071-4/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'zj-refs-hash' into 'master'Sean McGivern2018-02-072-24/+21
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use rugged in Repository#refs_hash Closes gitaly#880 See merge request gitlab-org/gitlab-ce!16827
| * | | | | | | | | | Don't use rugged in Repository#refs_hashZeger-Jan van de Weg2018-02-072-24/+21
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refs hash is used to determine what branches and tags have a commit as head in the network graph. The previous implementation depended on Rugged#references. The problem with this implementation was that it depended on rugged, but also that it iterated over all references and thus loading more data than needed if for example the project uses CI/CD environments, Pipelines, or Merge Requests. Given only refs are checked the network cares about the GraphHelper#refs method has no need to reject those, simplifying the method. Closes gitlab-org/gitaly#880
* | | | | | | | | | Merge branch 'rd-35856-backport-lfs-file-locking-api' into 'master'Sean McGivern2018-02-073-1/+91
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport LFS File Locking API Closes #35856 See merge request gitlab-org/gitlab-ce!16935
| * | | | | | | | | | Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-apiRubén Dávila2018-02-073-1/+91
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '41763-search-api' into 'master'Sean McGivern2018-02-072-7/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search API Closes #41763 See merge request gitlab-org/gitlab-ce!16878
| * | | | | | | | | | Return only limited pagination headers for search API endpointsJarka Kadlecová2018-02-062-4/+4
| | | | | | | | | | |
| * | | | | | | | | | Support search in APIJarka Kadlecová2018-02-063-11/+10
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '41209-ci-linter-fails-on-gitlab-ci-blob-viewer' into 'master'Kamil Trzciński2018-02-072-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "CI linter fails to work" Closes #41209 See merge request gitlab-org/gitlab-ce!16922
| * | | | | | | | | | | Handle all YAML parser exceptions in .gitlab-ci.yml (fixes #41209)41209-ci-linter-fails-on-gitlab-ci-blob-viewerDylan Griffith2018-02-072-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move the exception handling as close to the source as possible to avoid leaking Psych ahstraction - Also remove unnecessary rescue all statement from LintsController. This should not be necessary anymore since any YAML errors should all be caught by the #validation_message method.
* | | | | | | | | | | | Merge branch '26388-push-to-create-a-new-project' into 'master'Douwe Maan2018-02-066-64/+167
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0613-79/+152
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # lib/gitlab/path_regex.rb
| * | | | | | | | | | | | | Check ability ability before proceeding with project specific checksTiago Botelho2018-02-061-18/+23
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Moves project creationg to git access check for git pushTiago Botelho2018-02-066-44/+65
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Adds documentation for the featureTiago Botelho2018-02-061-2/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Abstracts ProjectMoved and ProjectCreated into a BaseProjectTiago Botelho2018-02-065-88/+71
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Move new project on push logic to a serviceTiago Botelho2018-02-064-21/+26
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add specsTiago Botelho2018-02-062-8/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Adds remote messsage when project is created in a push over SSH or HTTPTiago Botelho2018-02-063-15/+84
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Adds option to push over SSH to create a new projectTiago Botelho2018-02-061-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Adds option to push over HTTP to create a new projectTiago Botelho2018-02-061-5/+24
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | 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 'dm-route-path-validation' into 'master'Sean McGivern2018-02-062-13/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 appropriatelyDouwe Maan2018-02-062-13/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | 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 '42730-close-rugged-repository' into 'master'Douwe Maan2018-02-061-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "ProjectCacheWorker leaks file descriptors" Closes #42730 See merge request gitlab-org/gitlab-ce!16930
View Lorry Controller Status