summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add zoom call section in issue data pagelink_zoom_call_issue-docsSeth Engelhard2019-06-182-0/+6
|
* Merge branch 'revert-concurrent-pipeline-schedule-creation' into 'master'Kamil Trzciński2019-06-183-1/+49
|\ | | | | | | | | Revert concurrent pipeline creation for pipeline schedules See merge request gitlab-org/gitlab-ce!29794
| * Revert concurrent pipeline schedule creationrevert-concurrent-pipeline-schedule-creationShinya Maeda2019-06-183-1/+49
| | | | | | | | | | | | This commit reverts the previously introduced concurrent pipeline schedule creation which was a viable solution for mitigating inconsistent pipeline schedule by Sidekiq Memory Killer.
* | Merge branch 'docs-app-dev-platform' into 'master'Mike Lewis2019-06-181-0/+53
|\ \ | | | | | | | | | | | | Add docs for Application Development Platform See merge request gitlab-org/gitlab-ce!29765
| * | Update phrasing of Security paragraphMike Lewis2019-06-181-3/+3
| | |
| * | Fix typo in Security sectionMike Lewis2019-06-181-1/+1
| | |
| * | Update tense on compute sectiondocs-app-dev-platformDaniel Gruesso2019-06-181-1/+1
| | |
| * | Apply suggestion to doc/topics/application_development_platform/index.mdDaniel Gruesso2019-06-181-1/+1
| | |
| * | Apply suggestion to doc/topics/application_development_platform/index.mdDaniel Gruesso2019-06-181-1/+1
| | |
| * | Apply suggestion to doc/topics/application_development_platform/index.mdDaniel Gruesso2019-06-181-1/+1
| | |
| * | Apply suggestion to doc/topics/application_development_platform/index.mdDaniel Gruesso2019-06-181-1/+1
| | |
| * | Apply suggestion to doc/topics/application_development_platform/index.mdMike Lewis2019-06-181-2/+2
| | |
| * | Edit build test deploy sectionMike Lewis2019-06-181-3/+3
| | |
| * | Update doc overviewMike Lewis2019-06-181-2/+2
| | |
| * | First draft of app dev platform pagedanielgruesso2019-06-171-0/+53
| | |
* | | Merge branch 'dm-add-deep-dives-to-docs-ce' into 'master'Nick Thomas2019-06-187-2/+65
|\ \ \ | | | | | | | | | | | | | | | | Add Create Deep Dives to development docs See merge request gitlab-org/gitlab-ce!29793
| * | | Add Create Deep Dives to development docsdm-add-deep-dives-to-docs-ceDouwe Maan2019-06-187-2/+65
| | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/create-stage/issues/1 for more context
* | | | Merge branch '57815' into 'master'Kamil Trzciński2019-06-187-5/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | #57815 Changes for UltraAuth users See merge request gitlab-org/gitlab-ce!28941
| * | | | #57815 Password authentication disabled for UltraAuth usersKartikey Tanna2019-06-187-5/+62
|/ / / / | | | | | | | | | | | | | | | | Disabled password authentication for the users registered using omniauth-ultraauth strategy
* | | | Merge branch 'renovate/gitlab-ui-4.x' into 'master'63385-empty-iidMike Greiling2019-06-182-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^4.3.0 See merge request gitlab-org/gitlab-ce!29800
| * | | | Update dependency @gitlab/ui to ^4.3.0null2019-06-182-5/+5
| | | | |
* | | | | 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
| | | | | |
* | | | | | Merge branch '59257-find-new-branches-harder' into 'master'Rémy Coutable2019-06-183-1/+46
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Look for new branches more carefully Closes #59257 See merge request gitlab-org/gitlab-ce!29761
| * | | | | | Look for new branches more carefullyNick Thomas2019-06-183-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain cases, GitLab can miss a PostReceive invocation the first time a branch is pushed. When this happens, the "branch created" hooks are not run, which means various features don't work until the branch is deleted and pushed again. This MR changes the `Git::BranchPushService` so it checks the cache of existing branches in addition to the `oldrev` reported for the branch. If the branch name isn't in the cache, chances are we haven't run the service yet (it's what refreshes the cache), so we can go ahead and run it, even through `oldrev` is set. If the cache has been cleared by some other means in the meantime, then we'll still fail to run the hooks when we should. Fixing that in the general case is a larger problem, and we'd need to devote significant engineering effort to it. There's a chance that we'll run the relevant hooks *multiple times* with this change, if there's a race between the branch being created, and the `PostReceive` worker being run multiple times, but this can already happen, since Sidekiq is "at-least-once" execution of jobs. So, this should be safe.
* | | | | | | Merge branch 'chore/rename-variable-ce' into 'master'Mike Greiling2019-06-182-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename TOKEN_TYPES to USER_TOKEN_TYPES See merge request gitlab-org/gitlab-ce!29785
| * | | | | | | Rename TOKEN_TYPES to USER_TOKEN_TYPESArun Kumar Mohan2019-06-182-3/+3
| | | | | | | |
* | | | | | | | Merge branch 'issue_60515' into 'master'Sean McGivern2019-06-1832-2317/+381
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move some quick actions feature specs to unit tests Closes #60515 See merge request gitlab-org/gitlab-ce!28795
| * | | | | | | Move some quick actions feature specs to unit testsFelipe Artur2019-06-1832-2317/+381
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move some feature specs for issues/merge requests quick actions to unit tests. They are taking too long to run on the pipelines.
* | | | | | | Merge branch 'backport-report_approver-migration-to-ce' into 'master'Yorick Peterse2019-06-182-0/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport approval MR rules report_type migration to CE See merge request gitlab-org/gitlab-ce!29766
| * | | | | | | Backport approval MR rules report_type migration to CEbackport-report_approver-migration-to-ceLucas Charles2019-06-172-0/+14
| | | | | | | |
* | | | | | | | Merge branch '57918-encrypt-feature-flags-tokens' into 'master'Kamil Trzciński2019-06-186-1/+106
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add migrations needed to encrypt feature flags client tokens See merge request gitlab-org/gitlab-ce!29320
| * | | | | | | | 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 'zj-feature-flag-default-on-catfile-cache' into 'master'Douwe Maan2019-06-187-39/+84
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature flag default on catfile cache Closes gitaly#1712 See merge request gitlab-org/gitlab-ce!29556
| * | | | | | | | Turn on Cat-File cache by defaultZeger-Jan van de Weg2019-06-186-26/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-184-32/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | Merge branch 'docs/https-many-docs-links' into 'master'Achilleas Pipinellis2019-06-1817-28/+28
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Https many links in docs See merge request gitlab-org/gitlab-ce!29776
| * | | | | | | | | Https many links in docsEvan Read2019-06-1817-28/+28
|/ / / / / / / / /
* | | | | | | | | Merge branch 'docs/update-list-items' into 'master'Achilleas Pipinellis2019-06-181-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update list items to conform to documentation style guide See merge request gitlab-org/gitlab-ce!29739
| * | | | | | | | | Update list items to conform to documentation style guideArun Kumar Mohan2019-06-161-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'dz-remove-deprecated-group-routes' into 'master'Grzegorz Bizon2019-06-183-112/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated group routes See merge request gitlab-org/gitlab-ce!29351
| * | | | | | | | | | Remove deprecated group routesdz-remove-deprecated-group-routesDmitriy Zaporozhets2019-06-143-112/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | Merge branch 'gitaly-version-v1.47.0' into 'master'Yorick Peterse2019-06-182-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to v1.47.0 See merge request gitlab-org/gitlab-ce!29789
| * | | | | | | | | | | Upgrade Gitaly to v1.47.0GitalyBot2019-06-182-1/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '11449-qa-fixes-for-sast-ds-docs' into 'master'Achilleas Pipinellis2019-06-182-8/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typos, grammar and wording for SAST and DS report JSON docs See merge request gitlab-org/gitlab-ce!29744
| * | | | | | | | | | Fix typos, grammar and wording for SAST and DS report JSON docsVictor Zagorodny2019-06-182-8/+7
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '63231-wiki-nav' into 'master'Phil Hughes2019-06-184-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix header alignment on wiki and kubernetes pages Closes #63231 See merge request gitlab-org/gitlab-ce!29698
| * | | | | | | | | Fix header alignment on wiki and kubernetes pages63231-wiki-navAnnabel Dunstone Gray2019-06-144-3/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch 'move-all-configs-to-global' into 'master'Grzegorz Bizon2019-06-1821-316/+825
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce default: for gitlab-ci.yml Closes #62732 See merge request gitlab-org/gitlab-ce!24627
| * | | | | | | | | | Introduce default: for gitlab-ci.ymlKamil Trzciński2019-06-1821-316/+825
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.