summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '30125-markdown-security'Robert Speicher2017-04-055-25/+16
| | | | | | Remove class from SanitizationFilter whitelist See merge request !2079
* Merge branch 'gitaly-prevent-autoload' into 'master' Rémy Coutable2017-04-051-5/+33
|\ | | | | | | | | Deal with Rails autoload instance variable resets See merge request !10338
| * Deal with Rails autoload instance variable resetsJacob Vosmaer2017-04-051-5/+33
| | | | | | | | | | | | | | | | Rails auto-load (a development feature) can end up resetting instance variables on classes. This breaks Gitlab::GitalyClient, which uses instance variables to keep global hashes to look up channels and addresses. This change adds code that regenerates the hashes if they suddenly become nil.
* | Merge branch '30195-document-search-param-on-api' into 'master' Sean McGivern2017-04-051-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Add "search" optional param and docs for V4 Closes #30195 See merge request !10358
| * | Add "search" optional param and docs for V430195-document-search-param-on-apiOswaldo Ferreira2017-04-051-0/+1
| | | | | | | | | | | | Notice that this param is being supported since V3, but we have not added the proper docs for it
* | | Merge branch 'workhorse-1.4.3' into 'master' Sean McGivern2017-04-051-6/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Workhorse 1.4.3 Closes gitaly#167 and gitaly#177 See merge request !10479
| * | | Remove deprecated field from workhorse responseJacob Vosmaer2017-04-051-6/+1
| | |/ | |/|
* | | Merge branch 'convert-poll-interval-to-string' into 'master' Sean McGivern2017-04-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Convert value to string before setting Poll-Interval header See merge request !10477
| * | | Convert value to string before setting Poll-Interval headerconvert-poll-interval-to-stringAdam Niedzielski2017-04-051-1/+1
| |/ /
* | | Merge branch 'gitaly-refs' into 'master'Robert Speicher2017-04-056-16/+96
|\ \ \ | | | | | | | | | | | | | | | | Implement Gitaly refs client See merge request !9291
| * | | Incorporate Gitaly client for refs serviceAlejandro Rodríguez2017-04-046-16/+96
| | | |
* | | | Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middlewarewildcard-routes-in-etag-middlewareAdam Niedzielski2017-04-051-1/+1
| |/ / |/| | | | | | | | | | | | | | NamespaceValidator::WILDCARD_ROUTES is less restrictive than ProjectPathValidator::RESERVED and we really have to avoid only routes that contain wildcard names.
* | | Added mock deployment and monitoring service with environments fixturesKamil Trzciński2017-04-051-1/+7
| | |
* | | Handle SSH keys that have multiple spaces between each markerStan Hu2017-04-041-1/+1
| |/ |/| | | | | | | | | | | | | | | | | | | | | Notice what happens when a user adds a key with a space in between: ``` irb(main):004:0> 'ssh-rsa foobar'.split(/ /) => ["ssh-rsa", "", "foobar"] ``` This would cause gitlab-shell to receive a blank argument for the actual key, leading to users unable to login.
* | Merge branch 'bug/api_milestone_merge_requests_scope' into 'master' Rémy Coutable2017-04-041-1/+1
|\ \ | | | | | | | | | | | | Fixes milestone/merge_request API endpoint to really scope the results See merge request !10369
| * | Fixes milestone/merge_request API endpoint to really scope the resultsJoren De Groof2017-04-031-1/+1
| | | | | | | | | | | | | | | The MergeRequestsFinder uses the milestone_title instead of the milestone_id
* | | Fix issues importing forked projectsJames Lopez2017-04-046-7/+82
| | |
* | | Merge branch '30400-fix-blob-highlighting-in-search' into 'master' Sean McGivern2017-04-042-1/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix blob highlighting in search Closes #30400 See merge request !10420
| * | | Fix blob highlighting in searchNick Thomas2017-04-032-1/+22
| | | |
* | | | Merge branch 'workhorse-gitaly-address' into 'master' Sean McGivern2017-04-041-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Pass GitalyAddress to workhorse See merge request !10447
| * | | | Pass GitalyAddress to workhorseJacob Vosmaer2017-04-041-1/+6
| | |_|/ | |/| |
* | | | Merge branch 'fix/disable-gitaly-post-receive-pack' into 'master' Robert Speicher2017-04-041-1/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Disable support for Gitaly PostReceivePack See merge request !10444
| * | | Disable support for Gitaly PostReceivePackfix/disable-gitaly-post-receive-packAhmad Sherif2017-04-041-1/+2
| | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitaly/issues/172
* | | | Merge branch 'backport-sticking-api-helper-changes' into 'master' Kamil Trzciński2017-04-044-22/+20
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Backport API changes needed to fix sticking in EE See merge request !10376
| * | | Backport API changes needed to fix sticking in EEbackport-sticking-api-helper-changesYorick Peterse2017-03-314-22/+20
| | | | | | | | | | | | | | | | | | | | | | | | These changes are ported over from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1502 to reduce the number of merge conflicts that may occur.
* | | | Merge branch 'fix-github-importer-slowness' into 'master' Robert Speicher2017-04-033-2/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of GitHub importer Closes #28183 See merge request !10273
| * | | | Set the right timeout for Gitlab::Shell#fetch_remoteDouglas Barbosa Alexandre2017-04-031-1/+2
| | | | |
| * | | | Rename skip_metrics to imported on the importable concernDouglas Barbosa Alexandre2017-04-031-1/+1
| | | | |
| * | | | Skip MR metrics when importing projects from GitHubDouglas Barbosa Alexandre2017-04-031-1/+2
| | | | |
| * | | | Fetch GitHub project as a mirror to get all refs at onceDouglas Barbosa Alexandre2017-04-032-1/+20
| | | | |
* | | | | Merge branch 'namespace-race-condition' into 'master' Douwe Maan2017-04-031-1/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix race condition in namespace directory creation See merge request !10268
| * | | | | Fix race condition in namespace directory creationRobin Bobbitt2017-04-031-1/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'feature/support-grpc-calls-over-tcp-conn' into 'master' Robert Speicher2017-04-031-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Gitaly calls over TCP connection Closes gitaly#166 See merge request !10410
| * | | | | Add support for Gitaly calls over TCP connectionfeature/support-grpc-calls-over-tcp-connAhmad Sherif2017-04-031-1/+3
| | |_|_|/ | |/| | | | | | | | | | | | | Closes gitaly#166
* | | | | Merge branch 'feature/add-feature-flags-for-upload-receive-pack' into 'master' Robert Speicher2017-04-031-2/+14
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Add feature flags for enabling (Upload|Receive)Pack Closes gitaly#168 See merge request !10341
| * | | | Add feature flags for enabling (Upload|Receive)Pack for Gitalyfeature/add-feature-flags-for-upload-receive-packAhmad Sherif2017-04-031-2/+14
| |/ / / | | | | | | | | | | | | Closes gitaly#168
* | | | Merge branch 'style-proc-cop' into 'master' Rémy Coutable2017-04-032-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Enable Style/Proc cop for rubocop See merge request !10382
| * | | | Enable Style/Proc cop for rubocopmhasbini2017-04-022-3/+3
| | |_|/ | |/| |
* | | | Merge branch '22303-symbolic-in-tree' into 'master' Douwe Maan2017-04-032-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | #22303 fix mode representation git::tree ( in base 8 ) Closes #22303 See merge request !9780
| * | | Fix symlink icon in project treemhasbini2017-04-022-2/+2
| |/ /
* | | Merge branch 'introduce-base-polling-interval' into 'master' Sean McGivern2017-04-034-3/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Introduce "polling_interval_multiplier" as application setting Closes #29759 See merge request !10280
| * | | Introduce "polling_interval_multiplier" as application settingAdam Niedzielski2017-04-034-3/+34
| | |/ | |/| | | | | | | | | | Implement module for setting "Poll-Interval" response header. Return 429 in ETag caching middleware when polling is disabled.
* | | Merge branch 'workhorse-gitaly-repository' into 'master' Robert Speicher2017-04-031-2/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Pass Gitaly 'Repository' messages to workhorse for Git HTTP Closes gitaly#148 See merge request !10343
| * | | Pass Gitaly Repository messages to workhorseJacob Vosmaer2017-04-031-2/+10
| |/ /
* | | Merge branch '29541-fix-github-importer-deleted-fork' into 'master' Robert Speicher2017-04-032-11/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix GitHub importer for PRs of deleted forked repositories Closes #29541 See merge request !9992
| * | | Minor refactorGabriel Mazetto2017-04-032-12/+7
| | | |
| * | | Fix BrachFormatter for removed usersDouglas Barbosa Alexandre2017-04-031-1/+1
| | | |
| * | | One more change to the branch names to preserve metadataGabriel Mazetto2017-04-031-2/+2
| | | |
| * | | Prefixes source branch name with short SHA to avoid collisionDouglas Barbosa Alexandre2017-04-032-9/+17
| | | |
| * | | Fix GitHub importer for PRs of deleted forked repositoriesGabriel Mazetto2017-04-032-4/+20
| |/ /
View Lorry Controller Status