summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Adding order by to list runner jobs api.sujay patel2019-07-054-1/+65
| | | | | | | |
* | | | | | | | Merge branch 'ce-10283-notifications-for-ci-minutes-quota-limit-approaching' ↵James Lopez2019-07-052-0/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14328 See merge request gitlab-org/gitlab-ce!30003
| * | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14328ce-10283-notifications-for-ci-minutes-quota-limit-approachingRubén Dávila2019-07-052-0/+10
| | | | | | | |
* | | | | | | | Merge branch 'zj-remove-stale-feature-flag-keys' into 'master'Andreas Brandl2019-07-052-1/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused Gitaly feature flags See merge request gitlab-org/gitlab-ce!30302
| * | | | | | | | Remove unused Gitaly feature flagsZeger-Jan van de Weg2019-07-042-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When GitLab was migrating to Gitaly, feature flags were used. These are now out of use, and essentially a no-op. But they do make the output of chatops ugly and the feature table is selected in full by the application.
* | | | | | | | | Merge branch 'create-merge-train-ref-ce' into 'master'Douwe Maan2019-07-0511-26/+85
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Port: Extend `MergeToRefService` to create merge ref from an arbitrary ref See merge request gitlab-org/gitlab-ce!30361
| * | | | | | | | | Extend MergeToRefService for creating merge ref from the other refShinya Maeda2019-07-0511-26/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, MergeToRefService is specifically designed for createing merge commits from source branch and target branch of merge reqeusts. We extend this behavior to source branch and any target ref paths.
* | | | | | | | | | Merge branch 'make-explicit-endpoint-abort-in-auto-merge-ce' into 'master'Kamil Trzciński2019-07-0512-15/+129
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE Port: Split AutoMergeService interfaces into two `cancel` and `abort` See merge request gitlab-org/gitlab-ce!30249
| * | | | | | | | | | Split AutoMergeService interfaces into two `cancel` and `abort`make-explicit-endpoint-abort-in-auto-merge-ceShinya Maeda2019-07-0512-15/+129
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create explicit endpoint - abort.
* | | | | | | | | | Merge branch 'fetch-forked-projects-create-mr' into 'master'Filipa Lacerda2019-07-0516-15/+599
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create private merge requests in forks Closes #58583 See merge request gitlab-org/gitlab-ce!29984
| * | | | | | | | | | Create private merge requests in forksPhil Hughes2019-07-0516-15/+599
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* | | | | | | | | | | Merge branch 'ce-12464-remove-gitpushservice' into 'master'Lin Jen-Shin2019-07-051-5/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix call to removed GitPushService See merge request gitlab-org/gitlab-ce!30222
| * | | | | | | | | | | Fix call to removed GitPushServicece-12464-remove-gitpushserviceMarkus Koller2019-07-041-5/+7
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '12553-preferences' into 'master'Phil Hughes2019-07-052-6/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for app/views/profiles/preferences/show.html.haml Closes gitlab-ee#12553 See merge request gitlab-org/gitlab-ce!30397
| * | | | | | | | | | | Removes EE differencesFilipa Lacerda2019-07-052-6/+11
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-divergence-graph-error' into 'master'Filipa Lacerda2019-07-052-3/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix divergence graph loading error Closes #64143 See merge request gitlab-org/gitlab-ce!30393
| * | | | | | | | | | | Fix divergence graph loading errorPhil Hughes2019-07-052-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64143
* | | | | | | | | | | | Merge branch 'renovate/gitlab-ui-5.x' into 'master'Phil Hughes2019-07-052-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to ^5.3.2 See merge request gitlab-org/gitlab-ce!30259
| * | | | | | | | | | | | Update dependency @gitlab/ui to ^5.3.2Lukas Eipert2019-07-052-5/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '57793-fix-line-age' into 'master'Douwe Maan2019-07-0514-2053/+2527
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support note position tracing on an image See merge request gitlab-org/gitlab-ce!30158
| * | | | | | | | | | | | | Refactor PositionTracer to support different typesPatrick Bajao2019-07-0514-2053/+2527
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to prepare for supporing image type position tracing
* | | | | | | | | | | | | Merge branch 'remove_unused_k8s_service_methods' into 'master'Lin Jen-Shin2019-07-055-372/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove now unused KubernetesService methods See merge request gitlab-org/gitlab-ce!29925
| * | | | | | | | | | | | | Remove now unused KubernetesService methodsremove_unused_k8s_service_methodsJames Fargher2019-07-055-372/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that KubernetesService can no longer be a DeploymentPlatform we can remove all kubernetes client code and KubernetesService edge cases.
* | | | | | | | | | | | | | Merge branch 'patch-71' into 'master'Sean McGivern2019-07-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update SAST.gitlab-ci.yml w/ FAIL_NEVER ENV See merge request gitlab-org/gitlab-ce!30331
| * | | | | | | | | | | | | | Update SAST.gitlab-ci.yml w/ FAIL_NEVER ENVLucas Charles2019-07-051-0/+1
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/issues/10564
* | | | | | | | | | | | | | Merge branch 'fix-alerting-ui' into 'master'Phil Hughes2019-07-052-3/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alert creation dropdown menu Closes gitlab-ee#12572 See merge request gitlab-org/gitlab-ce!30332
| * | | | | | | | | | | | | Fix alert creation dropdown menuSarah Yasonik2019-07-052-3/+51
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'docs-workflow-images' into 'master'Marcia Ramos2019-07-0518-17/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Move gitlab_flow doc images to /img dir See merge request gitlab-org/gitlab-ce!30389
| * | | | | | | | | | | | Move workflow images to img dirMarcel Amirault2019-07-0518-17/+18
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean out workflow directory by moving images from gitlab_flow doc to /img
* | | | | | | | | | | | Merge branch 'if-6990-enforce_smartcard_session_for_git_and_api' into 'master'12-1-stable-prepare-rc1Bob Van Landuyt2019-07-052-13/+32
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of "Require session with smartcard login for Git access" See merge request gitlab-org/gitlab-ce!30384
| * | | | | | | | | | | | CE port of "Require session with smartcard login for Git access"Imre Farkas2019-07-052-13/+32
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch ↵Bob Van Landuyt2019-07-0516-16/+207
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '58409-increase-graphql-complexity-for-fields-that-make-gitaly-calls' into 'master' Increase GraphQL complexity for fields that make Gitaly Calls Closes #58409 See merge request gitlab-org/gitlab-ce!28814
| * | | | | | | | | | | Address reviewer comments58409-increase-graphql-complexity-for-fields-that-make-gitaly-callscharlieablett2019-07-056-25/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove Gitaly call check for fields that have a constant complexity declared - Add associated test
| * | | | | | | | | | | Address reviewer commentscharlieablett2019-07-035-40/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add 1 for all fields that call Gitaly (with resolvers or without) - Clarify comment regarding Gitaly call alert - Expose predicate `calls_gitaly?` instead of ivar
| * | | | | | | | | | | Wrap proc properly in gitaly call countscharlieablett2019-07-038-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add `calls_gitaly: true` to some fields missing (hey, it works!) - Clarify proc wrapping - Add kwargs argument to `mount_mutation`
| * | | | | | | | | | | Alert if `calls_gitaly` declaration missingcharlieablett2019-07-038-24/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move `calls_gitaly_check` to public - Add instrumentation for flagging missing CallsGitaly declarations - Wrap resolver proc in before-and-after Gitaly counts to get the net Gitaly call count for the resolver.
| * | | | | | | | | | | Remove potentially noisy warningcharlieablett2019-07-032-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If Gitaly calls are missing, it could be due to a conditional and may just become noise
| * | | | | | | | | | | Enumerate fields with Gitaly callscharlieablett2019-07-034-4/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a complexity of 1 if Gitaly is called at least once - Add an error notification if `calls_gitaly` isn't right for a particular field
* | | | | | | | | | | | Merge branch 'revert-68b1ed92' into 'master'Lin Jen-Shin2019-07-051-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_over_http_spec.rb from quarantine Closes gitlab-org/quality/staging#40 See merge request gitlab-org/gitlab-ce!30378
| * | | | | | | | | | | Revert "Merge branch 'qa-quarantine-failing-push-mirror-repo-spec' into ↵Mark Lapierre2019-07-051-2/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master'" This reverts merge request !25590
* | | | | | | | | | | Merge branch 'add-pgformatter-into-database-tooling-docs' into 'master'Evan Read2019-07-051-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pgFormatter as a database tooling See merge request gitlab-org/gitlab-ce!30374
| * | | | | | | | | | | Add pgFormatter as a database toolingMayra Cabrera2019-07-051-0/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes a PostgreSQL syntax beautifier as a database tooling.
* | | | | | | | | | | Merge branch 'patch-71' into 'master'NicoleSchwartz-Python-BlogEvan Read2019-07-051-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor spelling errors fixed See merge request gitlab-org/gitlab-ce!30303
| * | | | | | | | | | Minor spelling errors fixedAurelien2019-07-031-3/+3
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'docs-kramdown-warnings-2' into 'master'Evan Read2019-07-0421-126/+123
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix markdown to reduce number of kramdown warnings (part 2) See merge request gitlab-org/gitlab-ce!30150
| * | | | | | | | | | Small markdown tweaks to clear kramdown warningsMarcel Amirault2019-07-0421-126/+123
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing square brackets, links, etc in: merge_requests.md vulnerabilities.md issues.md issues_statistics.md pipelines.md services.md group_milestones.md milestones.md runners.md changelog.md issue_workflow.md elasticsearch.md api_graphql_styleguide.md automatic_ce_ee_merge.md file_storage.md architecture.md database_debugging.md index.md index.md frontend_testing.md pry_debugging.md vue.md development_process.md
* | | | | | | | | | Merge branch 'tc-fix-db-roulette' into 'master'Mayra Cabrera2019-07-043-36/+23
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix reviewer roulette for DB reviews See merge request gitlab-org/gitlab-ce!30300
| * | | | | | | | | DRY up conditions for files require DB reviewToon Claes2019-07-043-36/+23
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop using two separate lists for the conditions which files require a database review. Related discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30156#note_187732053
* | | | | | | | | Merge branch 'qa-increase-review-deploy-timeout' into 'master'Lin Jen-Shin2019-07-042-24/+106
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Review Apps] Add resource requests and limits to most of the chart resources See merge request gitlab-org/gitlab-ce!30155
| * | | | | | | | | Add resources requests and limits for all Review Apps resourcesRémy Coutable2019-07-041-23/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status