summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | Use nil instead of raising AmbiguousRefMatija Čupić2018-12-081-3/+1
| | | | | |
| | * | | | Use Gitlab::Git::Ref in Project#resolve_refMatija Čupić2018-12-083-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reworks Project#resolve_ref to return Gitlab::Git::Branch, Gitlab::Git::Tag or raise an AmbiguousRef error.
| | * | | | Prevent creating pipelines with ambiguous refsMatija Čupić2018-12-085-8/+12
| | | | | |
| | * | | | Use full ref when possible to avoid ambiguityMatija Čupić2018-12-081-1/+1
| | | | | |
| * | | | | Merge branch 'security-master-url-rel' into 'master'John Jarvis2019-01-021-6/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Set URL rel attribute for broken URLs See merge request gitlab/gitlabhq!2695
| | * | | | | Set URL rel attribute for broken URLsJan Provaznik2018-12-111-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible that URI fails to parse a link, but browsers still recognize given URL as a link, we should make sure that 'rel' attribute is set also in this case.
* | | | | | | Merge branch 's3-directories-get' into 'master'Kamil Trzciński2019-01-021-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use directories.new when getting S3 directory Closes gitlab-com/gl-infra/infrastructure#5807 See merge request gitlab-org/gitlab-ce!23981
| * | | | | | Use directories.new when getting S3 directoryJan Provaznik2018-12-271-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling `Fog::Storage::AWS::Directories#get` requires the ListAllMyBuckets permission, but we can avoid that extra query and permission by initializing the directory with a specific bucket: https://stackoverflow.com/a/12288581/1992201
* | | | | | Merge branch ↵Sean McGivern2019-01-021-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '55838-remove-gem-install-bundler-from-docker-based-ruby-environments' into 'master' Remove gem install bundler from Docker-based Ruby environments Closes #55838 See merge request gitlab-org/gitlab-ce!24093
| * | | | | | Remove gem install bundler from Docker-based Ruby environmentsTakuya Noguchi2019-01-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bundler gem has been included in the Docker official Ruby image since 2.1. Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqJohn Jarvis2019-01-011-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'security-master-guests-jobs-api' into 'master'John Jarvis2019-01-011-0/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [master] Guest users have access to all Job information via the API See merge request gitlab/gitlabhq!2717
| | * | | | | | Move pipeline auth above pipeline assignmentMatija Čupić2018-12-201-1/+1
| | | | | | | |
| | * | | | | | Authorize read_pipeline before read_buildMatija Čupić2018-12-191-0/+1
| | | | | | | |
| | * | | | | | Authorize read_build when listing pipeline jobsMatija Čupić2018-12-191-0/+2
| | | | | | | |
| | * | | | | | Authorize read_build action when listing jobsMatija Čupić2018-12-191-0/+2
| | | | | | | |
* | | | | | | | Merge branch 'patch-37' into 'master'Sean McGivern2019-01-011-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #55740: Use the '--no-document' option instead of the 'gem' tool's deprecated options Closes #55740 See merge request gitlab-org/gitlab-ce!24049
| * | | | | | | | Update lib/gitlab/ci/templates/Ruby.gitlab-ci.ymlFatih Sarhan2018-12-311-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'sh-bump-omniauth-google-gem' into 'master'Sean McGivern2019-01-012-2/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Omniauth and JWT gems to switch away from Google+ API Closes #55668 See merge request gitlab-org/gitlab-ce!24068
| * | | | | | | | Set typ field in JSONWebToken::RSATokenStan Hu2018-12-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ruby-jwt v2.0 removed the `typ` header in https://github.com/jwt/ruby-jwt/commit/cc41d53e00f8cbf015271b53f5ad761bd6ac2312. To ensure tokens don't get marked invalid during an upgrade, add it back to ensure backwards compatibility.
| * | | | | | | | Add typ header back into JWT payloadStan Hu2018-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ruby-jwt v2.0 removed the `typ` header in https://github.com/jwt/ruby-jwt/commit/cc41d53e00f8cbf015271b53f5ad761bd6ac2312. To ensure tokens don't get marked invalid during an upgrade, add it back to ensure backwards compatibility.
* | | | | | | | | Merge branch 'fj-55781-fix-api-blob-content-disposition' into 'master'Sean McGivern2018-12-311-1/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed content-disposition in blob and files API endpoint Closes #55781 See merge request gitlab-org/gitlab-ce!24078
| * | | | | | | | | Fixed api content-disposition in blob and files endpointFrancisco Javier López2018-12-311-1/+7
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Add spec for Release APIShinya Maeda2018-12-314-65/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec for all release API - GET, POST, PUT, DELETE. Also, fixes some minior bugs.
* | | | | | | | | Add delete method in Release APIShinya Maeda2018-12-311-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce DELETE endpoint in Release API
* | | | | | | | | Refactor Release servicesAlessio Caiazza2018-12-312-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CreateReleaseService and UpdateReleaseService now takes all the release attributes as constructor parameters. This will simplify attribute expansion
* | | | | | | | | ReleasesFinder will always return a relationAlessio Caiazza2018-12-311-1/+1
| | | | | | | | |
* | | | | | | | | Expose assets in releases APIAlessio Caiazza2018-12-311-0/+14
| | | | | | | | |
* | | | | | | | | Add releases APIAlessio Caiazza2018-12-315-12/+137
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces Releases API under /api/v4/projects/:id/releases * We are introducing release policies at project level. * We are deprecating releases changes from tags, both api and web interface. * Tags::CreateService no longer create a release This feature is controlled by :releases_page feature flag
* | | | | | | | Skip per-commit validations which have already passed on another change/branchFrancisco Javier López2018-12-283-13/+28
| | | | | | | |
* | | | | | | | Merge branch '51970-correct-ordering-of-metrics' into 'master'Kamil Trzciński2018-12-281-2/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the ordering of metrics on performance dashboard Closes #51970 See merge request gitlab-org/gitlab-ce!23630
| * | | | | | | | Correct ordering of metricsrpereira22018-12-211-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the ordering of metrics on performance dashboard. Before common metrics were moved into the DB, metric groups were ordered by the priority defined in the common_metrics.yml file. This commit adds a priority to each metric group in the PrometheusMetric model. It also combines title, priority and required_metrics into one frozen GROUP_DETAILS hash so that the code is clearer. This can be done since there is a fixed set of groups which are not configurable.
* | | | | | | | | Merge branch 'fj-fix-lfs-image-comments-diffs' into 'master'Douwe Maan2018-12-283-18/+24
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug commenting LFS images and displaying LFS files Closes #43783 See merge request gitlab-org/gitlab-ce!23812
| * | | | | | | | Fixing image lfs bug and also displaying text lfsFrancisco Javier López2018-12-273-18/+24
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit, introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23812, fixes a problem creating a displaying image diff notes when the image is stored in LFS. The main problem was that `Gitlab::Diff::File` was returning an invalid valid in `text?` for this kind of files. It also fixes a rendering problem with other LFS files, like text ones. They LFS pointer shouldn't be shown when LFS is enabled for the project, but they were.
* | | | | | | | Fix timeout issues retrieving branches via APIStan Hu2018-12-271-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47d4890d changed the order of pagination so that the full list of branches would be passed to Gitaly to determine which ones had been merged, but this operation can timeout for large repositories with many branches. We only need to determine whether the found branches have been merged, so limit the scan to those. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55724
* | | | | | | Merge branch 'osw-cache-discussions-diff-highlighting' into 'master'Douwe Maan2018-12-273-3/+166
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Considerably improve the loading time on merge request's discussion page Closes #52950 See merge request gitlab-org/gitlab-ce!23857
| * | | | | | | Cache diff highlight in discussionsOswaldo Ferreira2018-12-213-3/+166
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit handles note diffs caching, which considerably improves the performance on merge requests with lots of comments. Important to note that the caching approach taken here is different from `Gitlab::Diff::HighlightCache`. We do not reset the whole cache when a new push is sent or anything else. That's because discussions diffs are persisted and do not change.
* | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2018-12-2613-184/+258
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54953-error-500-viewing-merge-request-due-to-nil-commit_email_hostname * upstream/master: (115 commits) [CE] Speed up login page usage Add new line and comments Fix the seeder 24_forks.rb cannot find public project Milestones on community contribution issues Removed Gitlab Upgrader found in /lib/gitlab/upgrader.rb Fix and move specs into admin_disables_git_access_protocol_spec.rb Fix HTTP/SSH clone panel for mobile Add spec for HTTP/SSH clone panel Fix missing Git clone button when protocol restriction setting enabled Fix deprecation: Using positional arguments in integration tests Extend override check to also check arity Update tm cli version Bump Gitaly version to v1.12.0 Add @dbalexandre to CODEOWNERS Update verbiage for clarity Change group-cluster beta to regular note Change alpha states to use note instead of warning Update registry section. Update serverless.yaml formatting Clarify obtaining application URL Add @godfat to CODEOWNERS ...
| * \ \ \ \ \ \ Merge branch '42125-extend-override-check-to-also-check-arity' into 'master'Lin Jen-Shin2018-12-261-31/+78
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Extend `override` check to also check arity" Closes #42125 See merge request gitlab-org/gitlab-ce!23498
| | * | | | | | | Extend override check to also check arity42125-extend-override-check-to-also-check-arityJacopo2018-12-221-31/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Override now cares about parents method arity: if parents arity doesn't match raises an error.
| * | | | | | | | Removed Gitlab Upgrader found in /lib/gitlab/upgrader.rbJacob Wolen2018-12-241-111/+0
| |/ / / / / / /
| * | | | | | | Bump Gitaly version to v1.12.0Stan Hu2018-12-211-3/+5
| | | | | | | |
| * | | | | | | Merge branch 'support-gitaly-tls' into 'master'Lin Jen-Shin2018-12-211-6/+36
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Support tls communication in gitaly See merge request gitlab-org/gitlab-ce!22602
| | * | | | | | Log certificate loading errors into sentryAhmad Hassan2018-12-201-4/+8
| | | | | | | |
| | * | | | | | Followups on reviewAhmad Hassan2018-12-191-17/+13
| | | | | | | |
| | * | | | | | Deduplicate certificatesAhmad Hassan2018-12-171-3/+13
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'origin/master' into support-gitaly-tlsAhmad Hassan2018-12-1744-216/+255
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into support-gitaly-tlsAhmad Hassan2018-12-11543-2161/+4863
| | |\ \ \ \ \ \ \
| | * | | | | | | | Rename load_certs and include default cert fileAhmad Hassan2018-12-111-3/+8
| | | | | | | | | |
| | * | | | | | | | Manually load the certificatesAhmad Hassan2018-11-271-1/+7
| | | | | | | | | |