summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Replace runtime isEE check with compile time one60213-fix-is-ee-webpack-checksLukas Eipert2019-07-0513-41/+25
| | | | | | | | | This has the benefit that CE bundles will remove dead code in CE only builds. We have a follow-up issue to get rid of this completely: https://gitlab.com/gitlab-org/gitlab-ce/issues/64173
* 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>
| * | | Retry review-deploy only onceRémy Coutable2019-07-041-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'docs-ee-12592-ce-59847' into 'master'Marcia Ramos2019-07-043-10/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Clarify project and repo size Closes gitlab-ee#12592 See merge request gitlab-org/gitlab-ce!30322
| * | | | Docs: Clarify project and repo sizeCynthia Ng2019-07-043-10/+9
|/ / / /
* | | | Merge branch 'doc-mj/definition-of-done' into 'master'Marcia Ramos2019-07-041-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Definition of done includes deployed change See merge request gitlab-org/gitlab-ce!30362
| * | | | Definition of done includes deployed changeMarin Jankovski2019-07-041-0/+1
| | | | |
* | | | | Merge branch 'add-user-info-to-auth-logs-docs' into 'master'Marcia Ramos2019-07-041-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add docs for new info on `auth.log` See merge request gitlab-org/gitlab-ce!30315
| * | | | | Add new info for auth.logMayra Cabrera2019-07-041-0/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From 12.1, user information (id and username) are also included on auth.log. Documentation was updated to reflect this. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/62756
* | | | | Merge branch 'fix-sidekiq-transaction-check-race' into 'master'Nick Thomas2019-07-042-6/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix race in forbid_sidekiq_in_transactions.rb Closes #64088 See merge request gitlab-org/gitlab-ce!30359
| * | | | | Fix race in forbid_sidekiq_in_transactions.rbfix-sidekiq-transaction-check-raceKamil Trzciński2019-07-042-6/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Current code uses module attribute which stores value global instead of locally (thread locally). This results in concurrent accesses to overwrite the each other values
* | | | | Merge branch 'mj/config-readme-diff' into 'master'Achilleas Pipinellis2019-07-041-2/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove empty lines in config/README.md See merge request gitlab-org/gitlab-ce!30346
| * | | | | Remove empty lines in config/README.mdmj/config-readme-diffMarin Jankovski2019-07-041-2/+1
| | | | | |
* | | | | | Merge branch '54117-transactional-rebase' into 'master'Douglas Barbosa Alexandre2019-07-0415-41/+191
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow asynchronous rebase operations to be monitored Closes #54117 See merge request gitlab-org/gitlab-ce!29940
| * | | | | Allow asynchronous rebase operations to be monitoredNick Thomas2019-07-0414-38/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR introduces tracking of the `rebase_jid` for merge requests. As with `merge_ongoing?`, `rebase_in_progress?` will now return true if a rebase is proceeding in sidekiq. After one release, we should remove the Gitaly-based lookup of rebases. It is much better to track this kind of thing via the database.
| * | | | | Clarify documentation of Gitlab::SidekiqStatusNick Thomas2019-07-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "running" state is ambiguous. Clarify that it covers both enqueued and actually running jobs.
* | | | | | Merge branch '64079-aggregation-schedule-should-keep-lease-until-timeout' ↵Rémy Coutable2019-07-043-15/+63
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Implements `lease_release?` on `NamespaceAggregation` Closes #64079 See merge request gitlab-org/gitlab-ce!30305
| * | | | | | Implements lease_release on NamespaceAggregationMayra Cabrera2019-07-043-15/+63
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets lease_release? to false to prevent the job to be re-executed more often than lease timeout Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64079
* | | | | | Merge branch 'update-todo-in-ui' into 'master'Phil Hughes2019-07-0423-142/+178
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change "Todo" to "To Do" in UI Closes #61501 See merge request gitlab-org/gitlab-ce!28844
| * | | | | | Change 'Todo' to 'To Do'Christie Lenneville2019-07-0423-142/+178
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we label items to be done as "Todo." This is grammatically incorrect and (therefore) confusing—especially to our Spanish-speaking users for whom "todo" has a specific and unrelated meaning. We should use "To Do" and always use it as singular (not "To Dos"). Updates to wording in a few places per MR (ee) discussion Updating locale/gitlab.pot Updates to wording in a few places per MR (ee) discussion Updating locale/gitlab.pot
* | | | | | Merge branch '12556-flash-message' into 'master'Phil Hughes2019-07-041-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for app/views/projects/_flash_messages.html.haml Closes gitlab-ee#12556 See merge request gitlab-org/gitlab-ce!30344
| * | | | | Removes EE differences12556-flash-messageFilipa Lacerda2019-07-041-0/+1
| | | | | |
* | | | | | Merge branch '12488-add-remove-parent-epic-quick-actions-doc-ce' into 'master'Achilleas Pipinellis2019-07-041-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation on quick actions for add/remove epic parent relations. See merge request gitlab-org/gitlab-ce!30174
| * | | | | | Add documentation on quick actions for add/remove epic parent relations.Eugenia Grieff2019-07-041-0/+2
|/ / / / / /
View Lorry Controller Status