summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Integrate csslabClement Ho2018-12-0816-12/+26
|
* Merge branch ↵Stan Hu2018-12-081-1/+1
|\ | | | | | | | | | | | | | | | | '55054-correlation-ids-being-passed-through-grpc-metadata-are-incorrect' into 'master' Fix for incorrect Correlation-ID key being passed through GRPC metadata Closes #55054 See merge request gitlab-org/gitlab-ce!23666
| * Rename the correlation field from `correlation_id` to `x-gitlab-correlation-id`Andrew Newdigate2018-12-071-1/+1
| |
* | Merge branch 'winh-kushal-codeowners' into 'master'Clement Ho2018-12-081-2/+2
|\ \ | | | | | | | | | | | | Add Kushal to frontend CODEOWNERS See merge request gitlab-org/gitlab-ce!23664
| * | Add Kushal to frontend CODEOWNERSWinnie Hellmann2018-12-081-2/+2
|/ /
* | Merge branch 'tc-backfill-hashed-project_repositories' into 'master'Stan Hu2018-12-074-0/+255
|\ \ | |/ |/| | | | | | | | | Fill project_repositories for hashed storage projects Closes #48527 See merge request gitlab-org/gitlab-ce!23482
| * Fill project_repositories for hashed storageDouglas Barbosa Alexandre2018-12-063-147/+91
| |
| * Fill project_repositories for hashed storageToon Claes2018-12-064-0/+311
| | | | | | | | | | | | | | This adds a background migration that will ensure all projects that are on hashed storage have a row in `project_repositories`. Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/48527
* | Merge branch 'sh-disble-docs-internal-links-lint' into 'master'Clement Ho2018-12-071-1/+2
|\ \ | | | | | | | | | | | | | | | | | | Disable docs lint internal_links check Closes #55038 See merge request gitlab-org/gitlab-ce!23665
| * | Disable docs lint internal_links checkStan Hu2018-12-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This check never worked once the global navigation changes were rolled out in https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/362. The global nav will ALWAYS include /ce and /ee links, and the CE and EE repos will never include documentation for both. gitlab-docs now expects the documentation to be in the following directories: * /tmp/gitlab-docs/ce (CE) * /tmp/gitlab-docs/ee (EE) * /tmp/gitlab-docs/omnibus (Omnibus) The problem is that the CE and EE repos will only include one of the first two. Let's disable this check until https://gitlab.com/gitlab-com/gitlab-docs/issues/305 is resolved. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55038
* | | Merge branch '52007-frontmatter-toml-json' into 'master'Douwe Maan2018-12-076-81/+180
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Changed frontmatter filtering to support YAML, JSON, TOML, and arbitrary languages Closes #52007 See merge request gitlab-org/gitlab-ce!23331
| * | Changed frontmatter filtering to support YAML, JSON, TOML, and arbitrary ↵Travis Miller2018-12-076-81/+180
|/ / | | | | | | languages
* | Merge branch '20422-hide-ui-variables-by-default' into 'master'Robert Speicher2018-12-0712-66/+259
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Hide variables in UI by default" Closes #20422 See merge request gitlab-org/gitlab-ce!23518
| * \ Merge remote-tracking branch 'origin/master' into ↵jhampton2018-12-071208-7630/+24196
| |\ \ | | | | | | | | | | | | 20422-hide-ui-variables-by-default
| * | | Prettifiesjhampton2018-12-071-2/+2
| | | |
| * | | Merge branch '20422-hide-ui-variables-by-default' of ↵jhampton2018-12-071-54/+55
| |\ \ \ | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into 20422-hide-ui-variables-by-default
| | * | | Reorganize Jobs Variables feature specMatija Čupić2018-12-071-54/+55
| | | | |
| * | | | Fixes linting errorsjhampton2018-12-071-0/+5
| | | | |
| * | | | Merges incoming changesjhampton2018-12-072-2/+3
| |\ \ \ \ | | |/ / /
| | * | | Extract context in JobsController specMatija Čupić2018-12-071-38/+40
| | | | |
| | * | | Add specs for TriggerVariableEntityMatija Čupić2018-12-072-1/+50
| | | | |
| * | | | Extract context in JobsController specMatija Čupić2018-12-071-38/+40
| | | | |
| * | | | Add specs for TriggerVariableEntityMatija Čupić2018-12-072-1/+49
| |/ / /
| * | | Adds toggle behaviorjhampton2018-12-071-2/+21
| | | | | | | | | | | | | | | | - Adds coverage for hide/reveal toggle button behavior
| * | | Updates documentation around variablesjhampton2018-12-071-1/+1
| | | | | | | | | | | | | | | | - Owners and Maintainers are able to view trigger variable values
| * | | Vertically aligns variablesjhampton2018-12-071-0/+1
| | | | | | | | | | | | | | | | - Long named variable key/values are vertially aligned
| * | | Fixes rubocop offensesjhampton2018-12-071-4/+0
| | | | | | | | | | | | | | | | | | | | - Fixes multiple hooks within the same group - Omits the default 'each'
| * | | Adjusts tests per MR feedbackjhampton2018-12-062-33/+75
| | | | | | | | | | | | | | | | - Updates tests / applies patterns per MR feedback
| * | | Adds optional attribute to value propertyjhampton2018-12-061-1/+1
| | | | | | | | | | | | | | | | - Value is no longer required
| * | | Updates trigger documentationjhampton2018-12-062-1/+1
| | | | | | | | | | | | | | | | | | | | - Adds documentation around viewing trigger variables - Updates trigger variable values image
| * | | Adjusts variables table widthjhampton2018-12-061-0/+1
| | | | | | | | | | | | | | | | - The table width was shrinking with smaller variable names
| * | | Adds changelog entry for issue 20422jhampton2018-12-061-0/+6
| | | | | | | | | | | | | | | | - Adds changelog entry for 'hiding pipeline trigger variable values in UI'
| * | | Adding newly translated stringsjhampton2018-12-061-3/+9
| | | | | | | | | | | | | | | | - Adds strings related to hiding trigger variable values in the UI
| * | | Fixes broken testsjhampton2018-12-062-1/+19
| | | | | | | | | | | | | | | | - Adjusts behavior to cover conditional trigger variable values
| * | | Fixes linting errorjhampton2018-12-061-9/+3
| | | | | | | | | | | | | | | | - Fixes linting error around missing key directive
| * | | Adjusts UI behavior around trigger variablesjhampton2018-12-051-9/+29
| | | | | | | | | | | | | | | | - Trigger variable values are now conditionally displayed based on user role
| * | | Removes value from required propertiesjhampton2018-12-051-1/+0
| | | | | | | | | | | | | | | | - Value is now conditionally included
| * | | Horizontally aligns textjhampton2018-12-051-0/+1
| | | | | | | | | | | | | | | | - Horizontall aligns span and button text
| * | | Updates per MR feedbackjhampton2018-12-041-11/+9
| | | | | | | | | | | | | | | | | | | | - Removes element in favor of class name - Adjusts to use existing variables
| * | | Updates per MR feedbackjhampton2018-12-041-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Adjusts il8n implementation - Removes unnecessary type check - Adjusts to use Vue shorthand directives - Adjusts class names
| * | | Conditionally display variable valuesjhampton2018-12-031-25/+51
| | | | | | | | | | | | | | | | | | | | We want to hide trigger varialbes values in the UI by default. A toggle button will be available to maintainers.
| * | | Styles trigger variables blockjhampton2018-12-031-1/+15
| | | | | | | | | | | | | | | | Adds new style to the trigger variables table.
| * | | Conditionally send variable valuesjhampton2018-12-031-1/+2
| | | | | | | | | | | | | | | | | | | | We only want to send trigger variable values if the user is a maintainer.
* | | | Merge branch 'ce-issue_5603' into 'master'Dmitriy Zaporozhets2018-12-072-25/+88
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [CE] - Add milestones autocomplete for epics See merge request gitlab-org/gitlab-ce!23660
| * | | | [CE] - Add milestones autocomplete for epicsFelipe Artur2018-12-072-25/+88
| | | | | | | | | | | | | | | | | | | | CE backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8632
* | | | | Merge branch 'cert-manager-email' into 'master'Dmitriy Zaporozhets2018-12-0716-32/+202
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ability to override Issuer Email for Cert Manager See merge request gitlab-org/gitlab-ce!23503
| * | | | | Documentation cleanupAmit Rathi2018-12-081-1/+1
| | | | | |
| * | | | | Allows user to override default issuer email for cert managerAmit Rathi2018-12-0716-32/+202
| | | | | |
* | | | | | Merge branch 'zj-pool-repository-creation' into 'master'Nick Thomas2018-12-0726-6/+703
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Allow public forks to be deduplicated See merge request gitlab-org/gitlab-ce!23508
| * | | | | Allow public forks to be deduplicatedZeger-Jan van de Weg2018-12-0726-6/+703
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project is forked, the new repository used to be a deep copy of everything stored on disk by leveraging `git clone`. This works well, and makes isolation between repository easy. However, the clone is at the start 100% the same as the origin repository. And in the case of the objects in the object directory, this is almost always going to be a lot of duplication. Object Pools are a way to create a third repository that essentially only exists for its 'objects' subdirectory. This third repository's object directory will be set as alternate location for objects. This means that in the case an object is missing in the local repository, git will look in another location. This other location is the object pool repository. When Git performs garbage collection, it's smart enough to check the alternate location. When objects are duplicated, it will allow git to throw one copy away. This copy is on the local repository, where to pool remains as is. These pools have an origin location, which for now will always be a repository that itself is not a fork. When the root of a fork network is forked by a user, the fork still clones the full repository. Async, the pool repository will be created. Either one of these processes can be done earlier than the other. To handle this race condition, the Join ObjectPool operation is idempotent. Given its idempotent, we can schedule it twice, with the same effect. To accommodate the holding of state two migrations have been added. 1. Added a state column to the pool_repositories column. This column is managed by the state machine, allowing for hooks on transitions. 2. pool_repositories now has a source_project_id. This column in convenient to have for multiple reasons: it has a unique index allowing the database to handle race conditions when creating a new record. Also, it's nice to know who the host is. As that's a short link to the fork networks root. Object pools are only available for public project, which use hashed storage and when forking from the root of the fork network. (That is, the project being forked from itself isn't a fork) In this commit message I use both ObjectPool and Pool repositories, which are alike, but different from each other. ObjectPool refers to whatever is on the disk stored and managed by Gitaly. PoolRepository is the record in the database.