summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Use NotesFinder to fetch notes on API and ControllersPatrick Derichs2019-06-195-28/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing iid query on NotesFinder Changed parameters of find_noteable, so changes across a few files were needed. MergeRequest also requires iid instead of id query Make NotesFinder fail with RecordNotFound again Add specs for target_iid Using RSpec tablesyntax for target_iid specs Revert "Using RSpec tablesyntax for target_iid specs" This reverts commit ba45c7f569a. Allow find_by! here Fix variable name Add readable check Revert "Add readable check" This reverts commit 9e3a1a7aa39. Remove unnecessary assignment Add required changes for EE Fix parameter count Reduce code duplication by extracting a noteable module method The call to find_noteable was redundant so multiple files and lines have changed in that commit to use the newly introduced module method `noteable`. Replace casecmp with include check Add parent_type parameter Revert "Reduce code duplication by extracting a noteable module method" This reverts commit 8c0923babff16. Method is no longer needed Check whether noteable can be read by user
* #57815 Password authentication disabled for UltraAuth usersKartikey Tanna2019-06-181-0/+4
| | | | | Disabled password authentication for the users registered using omniauth-ultraauth strategy
* Merge branch 'mc/bug/old-codequality-template-autodevops' into 'master'63415-error-when-viewing-page-2-or-later-of-elasticsearch-search-resultsLin Jen-Shin2019-06-182-24/+12
|\ | | | | | | | | Use new Code Quality job definition in Auto DevOps See merge request gitlab-org/gitlab-ce!29475
| * Refactor Code Quality templates into single filemc/bug/old-codequality-template-autodevopsMatija Čupić2019-06-142-24/+12
| |
* | Turn on Cat-File cache by defaultZeger-Jan van de Weg2019-06-183-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The feature flag has been introduced an was turned off by default, now the it will default to be turned on. That change would still allow users to turn this feature off by leveraging the Rails console by running: `Feature.disable("gitaly_catfile-cache")` Another option is to manage the number of items the LRU cache will contain, by updating the `config.toml` for Gitaly. This would be the `catfile_cache_size`: https://gitlab.com/gitlab-org/gitaly/blob/0dcb5c579e63754f557aef91a4fa7a00e5b8b127/config.toml.example#L27 Closes: https://gitlab.com/gitlab-org/gitaly/issues/1712
* | Move Gitaly feature flag logic to Feature::GitalyZeger-Jan van de Weg2019-06-182-18/+28
| | | | | | | | | | | | | | The GitalyClient held a lot of logic which was all very tightly coupled. In this instance the feature logic was extracted to make it do just a little less and create a bit more focus in the GitalyClient's responsibilies.
* | Introduce default: for gitlab-ci.ymlKamil Trzciński2019-06-1810-131/+314
| | | | | | | | | | | | | | | | | | | | | | This moves all existing `image/services/before_script/variables` into `default:`. This allows us to easily add a default and top-level entries. `default`: is keep backward compatible: to be considered to be job if `default:script:` is specified. This behavior should be removed. All existing `image/services/before_script/variables` are properly handled in root context.
* | Merge branch 'asciidoctor-upgrade' into 'master'Douwe Maan2019-06-181-6/+3
|\ \ | | | | | | | | | | | | | | | | | | Upgrade asciidoctor version to 2.0.10 and change method names in html5_converter Closes #63304 See merge request gitlab-org/gitlab-ce!29741
| * | Add changelog for the upgraderaju2492019-06-171-1/+0
| | |
| * | Revert to old name as its not needed to change and keep same in both filesraju2492019-06-172-2/+2
| | |
| * | Change asciidoc.rb to refer new backend nameraju2492019-06-171-1/+1
| | |
| * | Use same backend name, and remove reduntant use of requireraju2492019-06-171-2/+1
| | |
| * | Upgrade asciidoctor version to 2.0.10 and change menthod names in ↵raju2492019-06-171-4/+3
| | | | | | | | | | | | html5_converter
* | | Merge branch 'mc/feature/required-template-inclusion-single-commit-ce' into ↵Grzegorz Bizon2019-06-181-3/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Enforce template inclusion in pipelines - CE See merge request gitlab-org/gitlab-ce!29296
| * | | Backport CE changesmc/feature/required-template-inclusion-single-commit-ceMatija Čupić2019-06-171-3/+12
| | | | | | | | | | | | | | | | | | | | Backports CE changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14011/
* | | | Merge branch '56737-commits-and-mr-events-on-jira-api' into 'master'Stan Hu2019-06-171-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose currently supported events properly on services API Closes #56737 See merge request gitlab-org/gitlab-ce!29736
| * | | | 56737 Expose currently supported events properly on services APIZsolt Kovari2019-06-161-1/+1
| | |/ / | |/| |
* | | | Merge branch '55362-refresh-blank-service-account-token' into 'master'Thong Kuah2019-06-171-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refresh service_account_token for kubernetes_namespaces See merge request gitlab-org/gitlab-ce!29657
| * | | | Refresh service_account_token for kubernetes_namespaces55362-refresh-blank-service-account-tokenDylan Griffith2019-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There seems to be several examples where service_account_token is blank even in GitLab.com newly created kubernetes_namespaces . We have not figured out why they are blank but this should hopefully fix some issues similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/55362
* | | | | Merge branch 'generate-spans-for-sections' into 'master'Sean McGivern2019-06-171-12/+75
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add collapsible sections to job log See merge request gitlab-org/gitlab-ce!28642
| * | | | | Remove unused lineFabio Pitino2019-06-171-1/+0
| | | | | |
| * | | | | Compact syntax for default class namesFabio Pitino2019-06-171-5/+3
| | | | | |
| * | | | | Fix integration specs for tracingFabio Pitino2019-06-141-0/+2
| | | | | |
| * | | | | Merge branch 'generate-spans-for-sections' of ↵Fabio Pitino2019-06-141-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into generate-spans-for-sections
| | * | | | | Update class namesFilipa Lacerda2019-06-141-1/+1
| | | | | | |
| * | | | | | Fixing specsFabio Pitino2019-06-141-2/+5
| |/ / / / /
| * | | | | Adds margins to the section linesFilipa Lacerda2019-06-121-4/+4
| | | | | |
| * | | | | Moves JS into the vue componentFilipa Lacerda2019-06-121-47/+4
| | | | | |
| * | | | | Merge branch 'master' into generate-spans-for-sectionsFilipa Lacerda2019-06-12185-971/+2803
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (784 commits) Update Serverless.gitlab-ci-yml to fix lint warning Document when milestones and labels links are missing Update git object deduplication overview Apply tooltip on truncated commit title Add link to import video Update merge options for auto merge strategies Update note style in various docs Add link to Auto DevOps demo video Add link to Groups video Remove glossary content and make necessary doc edits to clarify terms Docs for Gitlab Runner docker use of private registries Metrics reports documentation is incomplete Update issues/index.md with note on label priority sorting API issues - minor cleanup of permission check Fix gl_dropdown scrolling to top on assignee click Final doc review Remove docs for a removed ES rake task Fixed markdown link in Docker compose note Documented the Admin Area's *Groups* page Docs: Updating issue data and actions doc ...
| * | | | | | Generate <span> with all sectionsKamil Trzciński2019-05-231-12/+116
| | | | | | |
* | | | | | | Backport the EE schema and migrations to CEYorick Peterse2019-06-1716-770/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports all EE schema changes to CE, including EE migrations, ensuring both use the same schema. == Updated tests A spec related to ghost and support bot users had to be modified to make it pass. The spec in question assumes that the "support_bot" column exists when defining the spec. In the single codebase setup this is not the case, as the column is backported in a later migration. Any attempt to use a different schema version or use of "around" blocks to conditionally disable specs won't help, as reverting the backport migration would also drop the "support_bot" column. Removing the "support_bot" tests entirely appears to be the only solution. We also need to update some foreign key tests now that we have backported the EE columns. Fortunately, these changes are very minor. == Backporting migrations This commit moves EE specific migrations (except those for the Geo tracking database) and related files to CE, and also removes any traces of the ee/db directory. Some migrations had to be modified or removed, as they no longer work with the schema being backported. These migrations were all quite old, so we opted for removing them where modifying them would take too much time and effort. Some old migrations were modified in EE, while also existing in CE. In these cases we took the EE code, and in one case removed them entirely. It's not worth spending time trying to merge these changes somehow as we plan to remove old migrations around the release of 12.0, see https://gitlab.com/gitlab-org/gitlab-ce/issues/59177 for more details.
* | | | | | | Allow custom names for concurrent foreign keysYorick Peterse2019-06-171-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary for backporting the EE schema to ensure backported foreign keys use the same key names.
* | | | | | | Fix GPG signature verification with recent versions of GnuPGDavid Palubin2019-06-171-8/+11
| | | | | | |
* | | | | | | Fix plan stage queryGosia Ksionek2019-06-1719-83/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix plan stage query and the way it is displayed
* | | | | | | Allow Developer role to delete tags via container registry apiJason Goodman2019-06-171-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings the API permissions in line with the UI permissions
* | | | | | | Merge branch 'boolean-values-from-matches-operator' into 'master'Kamil Trzciński2019-06-171-16/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return boolean from Pipeline::Expression::Lexeme::Matches#evaluate See merge request gitlab-org/gitlab-ce!29717
| * | | | | | | Return boolean from Lexeme::Matches#evaluateboolean-values-from-matches-operatordrew cimino2019-06-141-16/+0
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'sh-fix-issue-63158' into 'master'Rémy Coutable2019-06-171-0/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix inability to set visibility_level on project via API Closes #63158 See merge request gitlab-org/gitlab-ce!29578
| * | | | | | Fix inability to set visibility_level on project via APIsh-fix-issue-63158Stan Hu2019-06-141-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider the scenario: 1. The default visibility level is set to internal 2. A user attempts to create a private project within a private group Previously this would always fail because default_value_for would overwrite the private visibility setting, no matter what visibility_level were specified. This was happening because default_value_for was confused by the default value of 0 specified by the database schema. default_value_for attempts to assign the default value in the block by checking whether the attribute has changed. The problem is that since the default value by the database was 0, and the user requested 0, this appeared as though no changes were made. As a result, default_value_for would always overwrite the user's preference. To fix this, we remove the use of default_value_for and only set the visibility level to the default application setting when no preference has been given at creation time. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63158
* | | | | | | Merge branch 'bvl-comments-graphql' into 'master'Jan Provaznik2019-06-141-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose comments on Noteables in GraphQL Closes #62825 See merge request gitlab-org/gitlab-ce!29212
| * | | | | | | Expose comments on Noteables in GraphQLBob Van Landuyt2019-06-141-0/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This exposes `Note`s on Issues & MergeRequests using a `Types::Notes::NoteableType` in GraphQL. Exposing notes on a new type can be done by implementing the `NoteableType` interface on the type. The presented object should be a `Noteable`.
* | | | | | | Specify a dropdown name for dashboardsSarah Yasonik2019-06-142-1/+14
| | | | | | |
* | | | | | | Add basic support for AsciiDoc include directiveGuillaume Grossetie2019-06-143-32/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://asciidoctor.org/docs/user-manual/#include-directive
* | | | | | | Merge branch 'gitea_import_ignore_pull_request_comments' into 'master'Ash McKenzie2019-06-141-1/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't import pull request comments from Gitea repos Closes #63071 See merge request gitlab-org/gitlab-ce!29521
| * | | | | | Don't import pull request comments from Gitea reposJohn Kristensen2019-06-121-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Gitea API does not provide the following API endpoint for pull request comments: /api/v1/repos/{owner}/{repo}/pulls/comments When the importer attempts to request this endpoint it receives a '404 Not Found' error which causes the import to fail. By skipping any attempts to import pull requests comments from Gitea we can ensure that the import can complete successfully.
* | | | | | | AutoDevops fix ensure_namespace() does not explicitly test namespaceJack Lei2019-06-131-1/+1
| |/ / / / / |/| | | | |
* | | | | | Refactor for cleaner caching in dashboardsSarah Yasonik2019-06-134-25/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Opts to cache a full list of cached dashboards to better manage removing items from the cache. This also allows dashboards to be stored in the cache that don't necessarily correspond to a single dashboard yml.
* | | | | | Disable CI variable complex expressions by defaultdrew cimino2019-06-134-4/+4
| | | | | |
* | | | | | Merge branch 'ce-12091-remove-elasticsearch-lite-project' into 'master'Sean McGivern2019-06-131-4/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from 'Partially revert d9cb907c: "Avoid loading objects from DB in ES results"' See merge request gitlab-org/gitlab-ce!29597
| * | | | | | Revert "Avoid loading objects from DB in ES results"Nick Thomas2019-06-131-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d9cb907c3e987363065136bafb2156e86bc5de26.