summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'docs-nfriend-project-name-vs-project-path' into 'master'Marcia Ramos2019-07-251-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify difference between project name and project path for API usage See merge request gitlab-org/gitlab-ce!31019
| * | | | | | | Clarify project name vs pathdocs-nfriend-project-name-vs-project-pathNathan Friend2019-07-221-1/+6
| | | | | | | |
* | | | | | | | Merge branch 'sh-support-docker-oci-images' into 'master'Dmitriy Zaporozhets2019-07-255-5/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support Docker OCI images Closes gitlab-ee#12877 and #58685 See merge request gitlab-org/gitlab-ce!31127
| * | | | | | | | Support Docker OCI imagessh-support-docker-oci-imagesStan Hu2019-07-255-5/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker Distribution v2.7.0 shipped with OCI support, but our container registry client was not updated to handle the manifest format in the HTTP `Accept` header. As a result, API calls to retrieve a manifest would return with an error, "OCI manifest found, but accept header does not support OCI manifests". This would result in blank fields in the container registry page and prevent tags from being deleted. To fix this, we just need to add `application/vnd.oci.image.manifest.v1+json` to the `Accept` header and configure Faraday to parse the response as JSON. The response structure is the same as the standard Docker Distribution V2 manifest. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58685 Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/12877
* | | | | | | | | Merge branch '63457-additional-vue-autofixes' into 'master'Phil Hughes2019-07-254-15/+59
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vue-i18n: Autofix additional i18n lints for vue files See merge request gitlab-org/gitlab-ce!31125
| * | | | | | | | | Autofix i18n lints for vue filesEzekiel Kigbo2019-07-254-15/+59
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autofixes additional linting errors found in vue files.
* | | | | | | | | Merge branch 'refactor-redis-usage-counter-specs' into 'master'Nick Thomas2019-07-252-64/+66
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor usage data counters specs See merge request gitlab-org/gitlab-ce!31013
| * | | | | | | | | Refactor usage data counters specsrefactor-redis-usage-counter-specsAlex Kalderimis2019-07-222-64/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes these tests available for other implementations
* | | | | | | | | | Merge branch '9643-jira-api-serializer-ce' into 'master'Sean McGivern2019-07-252-1/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Create serializer for Jira API JSON payload See merge request gitlab-org/gitlab-ce!31139
| * | | | | | | | | | Backport Jira issue key regexHeinrich Lee Yu2019-07-252-1/+7
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'tc-revert-rails5-workaround' into 'master'Andreas Brandl2019-07-251-5/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Workaround for Rails 5, where LIMIT..." See merge request gitlab-org/gitlab-ce!30780
| * | | | | | | | | | | Revert "Workaround for Rails 5, where LIMIT..."tc-revert-rails5-workaroundToon Claes2019-07-161-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6823e7defb45dfd86d5258b40d6f82482d1ef451. Originally implemented in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21839, but an error was reported in https://gitlab.com/gitlab-org/gitlab-ce/issues/51729 resulting in a workaround introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21879. Now Rails 5.2 is used, this workaround no longer seems needed, so this reverts it.
* | | | | | | | | | | | Merge branch 'add-caching-to-archive-endpoint' into 'master'Grzegorz Bizon2019-07-254-7/+108
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return an ETag header for the archive endpoint See merge request gitlab-org/gitlab-ce!30581
| * | | | | | | | | | | Return an ETag headers for the archive endpointadd-caching-to-archive-endpointAhmad Sherif2019-07-234-7/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use the relative path of the archive to check for archive staleness.
* | | | | | | | | | | | Merge branch 'rs-spec-parity' into 'master'Lin Jen-Shin2019-07-255-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partial CE-EE parity for specs See merge request gitlab-org/gitlab-ce!31119
| * | | | | | | | | | | Copy private_access_spec from EErs-spec-parityRobert Speicher2019-07-241-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Copy dashboard fixture schema from EERobert Speicher2019-07-241-1/+5
| | | | | | | | | | | |
| * | | | | | | | | | | CE-EE parity for spec/viewsRobert Speicher2019-07-242-0/+2
| | | | | | | | | | | |
| * | | | | | | | | | | CE-EE parity for interpret_service_specRobert Speicher2019-07-241-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'make-relative-positioning-module-reusable' into 'master'Bob Van Landuyt2019-07-255-261/+300
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make RelativePositioning reusable See merge request gitlab-org/gitlab-ce!30993
| * | | | | | | | | | | Make RelativePositioning reusablemake-relative-positioning-module-reusableAdam Hegyi2019-07-245-261/+300
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RelativePositioning module was heavily dependent on the Issue model. This changes makes it easier to reuse the functionality provided by RelativePositioning in other models. Needed by: https://gitlab.com/gitlab-org/gitlab-ee/issues/12196
* | | | | | | | | | | | Merge branch 'sl-qa-staging-63-spam-issue-fix-ce' into 'master'Sanad Liaquat2019-07-252-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of "Fix spam in issue creation by making project private" See merge request gitlab-org/gitlab-ce!30997
| * | | | | | | | | | | Adds visibility attr to projectsl-qa-staging-63-spam-issue-fix-ceSanad Liaquat2019-07-222-3/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'docs-scim-updates' into 'master'Evan Read2019-07-254-21/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Improve SCIM documentation See merge request gitlab-org/gitlab-ce!31091
| * | | | | | | | | | | | Docs: Improve SCIM documentationTristan Williams2019-07-254-21/+30
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'sh-yarn-dedupe-docs' into 'master'Mike Greiling2019-07-251-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation on how to add dependencies to yarn See merge request gitlab-org/gitlab-ce!31066
| * | | | | | | | | | | | Add documentation on how to add dependencies to yarnsh-yarn-dedupe-docsStan Hu2019-07-231-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Danger constantly warns about de-duplicating dependencies, so put these instructions in the documentation so they can be searched.
* | | | | | | | | | | | | Merge branch 'patch-72' into 'master'Evan Read2019-07-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix rendering in Newline section See merge request gitlab-org/gitlab-ce!30992
| * | | | | | | | | | | | | Fix rendering in Newline sectionEric Lindsey2019-07-251-2/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'sh-rubocop-reverse-each' into 'master'Douglas Barbosa Alexandre2019-07-254-11/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Rubocop Performance/ReverseEach See merge request gitlab-org/gitlab-ce!31120
| * | | | | | | | | | | | | Enable Rubocop Performance/ReverseEachsh-rubocop-reverse-eachStan Hu2019-07-244-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Array.reverse_each` is faster than `Array.reverse.each` because: * reverse.each creates a new array then loops each element * reverse_each loops in reverse order (no intermediate array created)
* | | | | | | | | | | | | | Merge branch 'unnececssary-slack-redirect' into 'master'Evan Read2019-07-241-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation - Removed the unnecessary loop See merge request gitlab-org/gitlab-ce!31003
| * | | | | | | | | | | | | | Removed the unnecessary loop through `../project_services/slack.md`.Jeffrey Cafferata2019-07-221-2/+2
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'docs-markdown-whitespace' into 'master'Evan Read2019-07-241-28/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add whitespace back to markdown doc See merge request gitlab-org/gitlab-ce!31087
| * | | | | | | | | | | | | | | Add whitespace back to markdown docMarcel Amirault2019-07-241-28/+34
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch '12250-mvc-security-navigation-section-docs' into 'master'Evan Read2019-07-245-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs to reflect new Security tabs See merge request gitlab-org/gitlab-ce!31046
| * | | | | | | | | | | | | | Update docs to reflect new Security tabs12250-mvc-security-navigation-section-docsDave Pisek2019-07-245-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit includes changes to update the documentation so it reflects the new navigation structure introduced by the additional tab "Security & Compliance" to the project-views sidebar and "Security" to the group-views sidebar. * Screenshot * Paths to the Dependency List * Paths to the group-level security dashboard
* | | | | | | | | | | | | | | Merge branch ↵Paul Slaughter2019-07-242-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '64746-Commit-authors-avatar-sretched-in-commit-view-if-no-image-is-loaded' into 'master' Changed `author_avatar` to inline-block class Closes #64746 See merge request gitlab-org/gitlab-ce!30904
| * | | | | | | | | | | | | | | Changed `author_avatar` to inline-block classMarc Schwede2019-07-242-1/+6
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #64746
* | | | | | | | | | | | | | | Merge branch '64763-fix-tags-page-layout' into 'master'Fatih Acet2019-07-242-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix tags page layout See merge request gitlab-org/gitlab-ce!30951
| * | | | | | | | | | | | | | Fix tags page layoutAndré Luís2019-07-242-1/+6
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'sh-enable-rubocop-hash-search' into 'master'Mayra Cabrera2019-07-245-15/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Rubocop Performance/InefficientHashSearch Closes #64975 See merge request gitlab-org/gitlab-ce!31117
| * | | | | | | | | | | | | Enable Rubocop Performance/InefficientHashSearchsh-enable-rubocop-hash-searchStan Hu2019-07-245-15/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When used with a Hash, `.keys.include?` is bad because: 1. It performs a O(n) search instead of the efficient `.has_key?` 2. It clones all keys into separate array. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64975
* | | | | | | | | | | | | | Merge branch 'ce-docker_image_replication-event-generation' into 'master'Douglas Barbosa Alexandre2019-07-247-0/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14597 See merge request gitlab-org/gitlab-ce!30520
| * | | | | | | | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14597ce-docker_image_replication-event-generationValery Sizov2019-07-247-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first part of Docker Registry replication for secondary Geo node.
* | | | | | | | | | | | | | | Merge branch '48717-rate-limit-raw-controller-show' into 'master'Stan Hu2019-07-2412-17/+291
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add RateLimiter to RawController See merge request gitlab-org/gitlab-ce!30635
| * | | | | | | | | | | | | | | Add RateLimiter to RawControllerMayra Cabrera2019-07-2412-17/+291
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Limits raw requests to 300 per minute and per raw path. * Add a new attribute to ApplicationSettings so user can change this value on their instance. * Uses Gitlab::ActionRateLimiter to limit the raw requests. * Add a new method into ActionRateLimiter to log the event into auth.log Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/48717
* | | | | | | | | | | | | | | Merge branch '63730-fix-500-status-labels-pd' into 'master'Robert Speicher2019-07-243-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add where condition to filter out labels with type here Closes #63730 See merge request gitlab-org/gitlab-ce!30885
| * | | | | | | | | | | | | | | Add where condition to filter out invalid labels with nil type63730-fix-500-status-labels-pdPatrick Derichs2019-07-243-1/+19
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'cleanup/spec-tasks' into 'master'Douwe Maan2019-07-243-62/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves confusion within spec rake tasks. See merge request gitlab-org/gitlab-ce!31073