summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add migrations needed to encrypt feature flags client tokens57918-encrypt-feature-flags-tokensKrasimir Angelov2019-06-186-1/+106
| | | | | | | Make plaintext token column not null, add new token_encrypted column and index on project_id & token_encrypted. Post deployment migration to encrypt existing tokens.
* Merge branch 'hashed-storage-enabled-default' into 'master'Douglas Barbosa Alexandre2019-06-179-26/+33
|\ | | | | | | | | Hashed Storage is enabled by default on new installations See merge request gitlab-org/gitlab-ce!29586
| * 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-data-addition-ce-backport' into 'master'Filipa Lacerda2019-06-172-0/+2
|\ \ | | | | | | | | | | | | Toolbar backport changes for CE See merge request gitlab-org/gitlab-ce!29758
| * | Add backport linesreview-toolbar-data-addition-ce-backportsarahghp2019-06-172-0/+2
| | |
* | | Merge branch ↵Mike Greiling2019-06-173-2/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'ce-backport-11435-mr-search-by-approvers-doesn-t-use-reserved-values-for-none-and-any' into 'master' Backport fix MR search by approvers See merge request gitlab-org/gitlab-ce!29621
| * | | Backport fix MR search by approversJustin Boyson2019-06-173-2/+5
|/ / /
* | | Merge branch 'ce-12116-indexing-wikis-on-main' into 'master'test-sast-secretsMayra Cabrera2019-06-171-9/+5
|\ \ \ | | | | | | | | | | | | | | | | Backport docs for "Automatically index wikis in elasticsearch" See merge request gitlab-org/gitlab-ce!29612
| * | | Backport docs for "Automatically index wikis in elasticsearch"Nick Thomas2019-06-171-9/+5
|/ / /
* | | Merge branch 'visual-review-apps-fix-dropdown' into 'master'Mike Greiling2019-06-173-11/+11
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Move Dropdown to Stick to MR View App Button Closes gitlab-ee#12184 See merge request gitlab-org/gitlab-ce!29767
| * | Move Dropdown to Stick to MR View App ButtonAndrew Fontaine2019-06-173-11/+11
| | | | | | | | | | | | | | | | | | The dropdown of changed pages in the review app should be attached to the view app button. This moves it to the correct place. The Review App button is to the right of both of those.
* | | 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
View Lorry Controller Status