summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Hashed Storage is enabled by default on new installationshashed-storage-enabled-defaultGabriel Mazetto2019-06-179-26/+33
| | | | updated documentation for Geo
* Merge branch 'review-toolbar-docs' into 'master'Mike Lewis2019-06-173-0/+38
|\ | | | | | | | | Visual Review Toolbar Docs See merge request gitlab-org/gitlab-ce!29641
| * Fix that typoreview-toolbar-docssarahghp2019-06-171-1/+1
| |
| * Add link, badgesarahghp2019-06-171-2/+2
| |
| * Apply suggestion to doc/ci/review_apps/index.mdSarah Groff Hennigh-Palermo2019-06-171-0/+2
| |
| * Apply suggestion to doc/ci/review_apps/index.mdSarah Groff Hennigh-Palermo2019-06-171-1/+1
| |
| * Remove modal for realsarahghp2019-06-142-1/+0
| |
| * Apply suggestion to doc/ci/review_apps/index.mdSarah Groff Hennigh-Palermo2019-06-141-1/+1
| |
| * Apply suggestion to doc/ci/review_apps/index.mdSarah Groff Hennigh-Palermo2019-06-141-1/+1
| |
| * Update text and imagesarahghp2019-06-142-0/+2
| |
| * Apply suggestions from reviewSarah Groff Hennigh-Palermo2019-06-141-5/+8
| |
| * Update feature namesarahghp2019-06-141-9/+9
| |
| * Apply suggestions from reviewSarah Groff Hennigh-Palermo2019-06-141-5/+16
| |
| * Add more pixsarahghp2019-06-133-2/+2
| |
| * Fix broken linksarahghp2019-06-131-1/+1
| |
| * First pass, needs more pixsarahghp2019-06-132-0/+21
| |
* | Merge branch 'zj-disable-hooks-testing' into 'master'Bob Van Landuyt2019-06-172-15/+4
|\ \ | | | | | | | | | | | | Disable hooks by setting an ENV var See merge request gitlab-org/gitlab-ce!29672
| * | Disable hooks by setting an ENV varZeger-Jan van de Weg2019-06-142-15/+4
| | | | | | | | | | | | | | | | | | Prior to this change, the hooks directory got cleared. That works, but is not the way to go about it as there's a better way. Setting the env var this commits sets.
* | | Merge branch 'generate-spans-for-sections' into 'master'Sean McGivern2019-06-1713-57/+323
|\ \ \ | | | | | | | | | | | | | | | | Add collapsible sections to job log See merge request gitlab-org/gitlab-ce!28642
| * | | Remove unused lineFabio Pitino2019-06-171-1/+0
| | | |
| * | | Extract shared examples for duplicate sections and nonFabio Pitino2019-06-172-0/+38
| | | |
| * | | Use :first css element to collapseFabio Pitino2019-06-171-1/+4
| | | |
| * | | Ensure duplicate sections collapseFabio Pitino2019-06-173-3/+33
| | | |
| * | | Compact syntax for default class namesFabio Pitino2019-06-172-6/+4
| | | |
| * | | Make failing specs passgenerate-spans-for-sectionsFabio Pitino2019-06-172-7/+10
| | | |
| * | | Fix integration specs for tracingFabio Pitino2019-06-143-3/+5
| | | |
| * | | Replace _ with - in section class namesFabio Pitino2019-06-141-3/+3
| | | |
| * | | Merge branch 'generate-spans-for-sections' of ↵Fabio Pitino2019-06-146-9/+65
| |\ \ \ | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into generate-spans-for-sections
| | * | | Update class namesFilipa Lacerda2019-06-145-7/+7
| | | | |
| | * | | Adds specs and changelog - squashFilipa Lacerda2019-06-134-6/+62
| | | | |
| * | | | Fixing specsFabio Pitino2019-06-142-29/+40
| |/ / /
| * | | Add feature spec for collapsible sectionsFabio Pitino2019-06-132-0/+27
| | | |
| * | | Adds margins to the section linesFilipa Lacerda2019-06-123-12/+17
| | | |
| * | | Moves JS into the vue componentFilipa Lacerda2019-06-122-57/+47
| | | |
| * | | Removes CSSFilipa Lacerda2019-06-121-19/+0
| | | |
| * | | Merge branch 'master' into generate-spans-for-sectionsFilipa Lacerda2019-06-121937-21039/+33108
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-232-12/+135
| | | | |
* | | | | Merge branch 'mj/remove-old-password' into 'master'Marin Jankovski2019-06-171-3/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove no longer valid password See merge request gitlab-org/gitlab-ce!29751
| * | | | | Remove no longer valid passwordmj/remove-old-passwordMarin Jankovski2019-06-171-3/+0
| | | | | |
* | | | | | Merge branch 'backport-schema-changes' into 'master'Robert Speicher2019-06-17108-3455/+4716
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport the EE schema to CE Closes gitlab-ee#9686 See merge request gitlab-org/gitlab-ce!26940
| * | | | | | Run CI migrations since 11.11.0Yorick Peterse2019-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One can not upgrade straigt from 9.3 to 12.0, due to the schema changes being backported. Instead, one must first upgrade to 11.11.X. Omnibus already enforces this, and our online upgrade guidelines also cover this. By changing the CI config we don't have to adjust the backport migration to handle a migration path that one can not take.
| * | | | | | Backport the EE schema and migrations to CEYorick Peterse2019-06-17105-3449/+4679
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-172-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary for backporting the EE schema to ensure backported foreign keys use the same key names.
* | | | | | | Merge branch 'ce-11981-show-merge-train-position' into 'master'Filipa Lacerda2019-06-172-1/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport for gitlab-org/gitlab-ee!14064: Add merge train position indicator See merge request gitlab-org/gitlab-ce!29561
| * | | | | | | Add merge train position message (CE)Nathan Friend2019-06-172-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds an informational message under the pipeline block in the merge request widget that displays the current position of the merge request on the merge train.
* | | | | | | | Merge branch 'patch-29' into 'master'Nick Thomas2019-06-171-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | read_repository scope can be used for API See merge request gitlab-org/gitlab-ce!29663
| * | | | | | | | [skip ci] Update doorkeeper.en.ymlPierre Tardy2019-06-171-1/+1
| | | | | | | | |
| * | | | | | | | read_repository scope can be used for APIPierre Tardy2019-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as per documentation https://docs.gitlab.com/ee/api/repository_files.html You can use read_repository to access repository_file API. Not sure about write_repository as it is new and not documented in that page.
* | | | | | | | | Merge branch 'jej/prototype-ip-enforcement-per-group' into 'master'Douwe Maan2019-06-173-0/+28
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of IP address restriction for groups See merge request gitlab-org/gitlab-ce!29467
| * | | | | | | | | CE port of IP address restriction for groupsImre Farkas2019-06-173-0/+28
|/ / / / / / / / /
View Lorry Controller Status