summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add structure to admin area pagedocs/admin-area-doc-structureEvan Read2019-06-141-30/+34
| | | | Also slight edit and spelling correction
* Merge branch 'rc/add_back_sidekiq_exporter' into 'master'Stan Hu2019-06-141-0/+6
|\ | | | | | | | | Add back sidekiq metrics exporter See merge request gitlab-org/gitlab-ce!29647
| * Add back sidekiq metrics exporterrc/add_back_sidekiq_exporterRyan Cobb2019-06-131-0/+6
| |
* | Merge branch 'docs-correct-deploy-boards' into 'master'Evan Read2019-06-141-6/+0
|\ \ | | | | | | | | | | | | Remove incorrect docs from deploy_boards.md See merge request gitlab-org/gitlab-ce!29591
| * | Remove incorrect docs from deploy_boards.mddocs-correct-deploy-boardsDylan Griffith2019-06-131-6/+0
| | |
* | | Merge branch 'qa-e2e-tests-scoped-labels' into 'master'Mark Lapierre2019-06-1414-24/+98
|\ \ \ | | | | | | | | | | | | | | | | Backport of EE changes from MR !13763 See merge request gitlab-org/gitlab-ce!28983
| * | | Backport of EE changes from MR 13763Walmyr2019-06-1414-24/+98
|/ / / | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13763
* | | Merge branch 'fix-static-analysis-visual_review_toolbar' into 'master'Kushal Pandya2019-06-144-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Exclude preexisting lint issues for i18n Closes #63223 See merge request gitlab-org/gitlab-ce!29649
| * | | Exclude preexisting lint issues for i18nfix-static-analysis-visual_review_toolbarThong Kuah2019-06-144-0/+8
| | |/ | |/| | | | | | | | | | This was done in an MR pre https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26789
* | | Merge branch 'patch-38' into 'master'Evan Read2019-06-141-3/+8
|\ \ \ | |/ / |/| | | | | | | | Clarify ED25519 SSH key support See merge request gitlab-org/gitlab-ce!28167
| * | Clarify ED25519 SSH key supportBen Bodenmiller2019-06-141-3/+8
|/ /
* | Merge branch 'feature/require-2fa-for-all-entities-in-group' into 'master'Thong Kuah2019-06-145-27/+126
|\ \ | | | | | | | | | | | | inherit require 2fa for all subgroups and projects See merge request gitlab-org/gitlab-ce!24965
| * | refactor: do not apply setting "require 2FA" for ancestor group membersRoger Meier2019-06-133-4/+4
| | |
| * | refactor: apply "require 2FA" to all subgroup and ancestor group members, ↵Roger Meier2019-06-136-58/+116
| | | | | | | | | | | | when changing
| * | fix tests for mysql db.Roger Rüttimann2019-06-131-4/+4
| | |
| * | add changelog entryRoger Rüttimann2019-06-131-0/+7
| | |
| * | remove experiments for 2fa requirements and fix testsRoger Rüttimann2019-06-133-4/+8
| | |
| * | second try: fix mysql problem (not all users found)Roger Rüttimann2019-06-131-2/+2
| | |
| * | first try: fix mysql problem (not all users found)Roger Rüttimann2019-06-131-1/+1
| | |
| * | require update_two_factor_requirement on all sub-entities usersRoger Rüttimann2019-06-133-3/+13
| | |
| * | add tests for 2fa requirment for all sub-entities members (subgroup and ↵Roger Rüttimann2019-06-131-4/+24
| | | | | | | | | | | | projects)
* | | Merge branch '62440-vrt-make-mods' into 'master'Mike Greiling2019-06-1414-378/+571
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Review toolbar modularization Closes #62440 See merge request gitlab-org/gitlab-ce!29433
| * | | Breakup first passSarah Groff Hennigh-Palermo2019-06-1414-378/+571
|/ / / | | | | | | | | | It has a lot of files because that's the point
* | | Merge branch 'dz-update-milestones-labels-routes' into 'master'Mike Greiling2019-06-139-15/+47
|\ \ \ | | | | | | | | | | | | | | | | Use scoped routes for labels and milestones See merge request gitlab-org/gitlab-ce!29358
| * | | Use scoped routes for labels and milestonesDmitriy Zaporozhets2019-06-139-15/+47
|/ / / | | | | | | | | | | | | | | | Update frontend code to use /-/ scope for milestones and labels routes Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'sh-speed-up-commit-loading' into 'master'Douglas Barbosa Alexandre2019-06-133-1/+14
|\ \ \ | | | | | | | | | | | | | | | | Speed up commit loads by disabling BatchLoader replace_methods See merge request gitlab-org/gitlab-ce!29633
| * | | Speed up commit loads by disabling BatchLoader replace_methodsStan Hu2019-06-132-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've seen a significant performance penalty when using `BatchLoader#__replace_with!`. This defines methods on the batch loader that proxy to the 'real' object using send. The alternative is `method_missing`, which is slower. However, we've noticed that `method_missing` can be faster if: 1. The objects being loaded have a large interface. 2. We don't call too many methods on the loaded object. In production, we've seen the rendering times of the merge request widget increase as a result of loading commit data. BatchLoader attempts to call replace_methods on the lazy object, but this has a significant performance penalty. Disabling this mode (https://github.com/exAspArk/batch-loader/pull/45) appears to cut load times by about 50% for MergeRequestsController#show. Relates to https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/6941
| * | | Speed up merge request loads by disabling BatchLoader replace_methodsStan Hu2019-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In production, we've seen the rendering times of the merge request widget increase as a result of loading commit data. BatchLoader attempts to call replace_methods on the lazy object, but this has a significant performance penalty for modules that have many methods. Disabling this mode (https://github.com/exAspArk/batch-loader/pull/45) appears to cut load times by about 50% for MergeRequestsController#show. Relates to https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/6941
* | | | Merge branch 'ensure_namespace' into 'master'Thong Kuah2019-06-132-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AutoDevops fix ensure_namespace() does not explicitly test namespace Closes #50797 See merge request gitlab-org/gitlab-ce!29567
| * | | | AutoDevops fix ensure_namespace() does not explicitly test namespaceJack Lei2019-06-132-1/+6
|/ / / /
* | | | Merge branch 'target-slo-defects' into 'master'Mek Stittri2019-06-131-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Change SLA to target SLO for bugs and defects See merge request gitlab-org/gitlab-ce!29615
| * | | Change SLA to target SLO for bugs and defectstarget-slo-defectsMek Stittri2019-06-131-2/+2
| | | |
* | | | Merge branch 'sh-omit-blocked-admins-from-notification' into 'master'Robert Speicher2019-06-133-1/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Omit blocked admins from repository check e-mails Closes #63019 See merge request gitlab-org/gitlab-ce!29507
| * | | | Omit blocked admins from repository check e-mailssh-omit-blocked-admins-from-notificationStan Hu2019-06-123-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blocked admins should not receive notifications about failed repository checks. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63019
* | | | | Merge branch 'master-i18n' into 'master'Stan Hu2019-06-134-3504/+14577
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Master i18n See merge request gitlab-org/gitlab-ce!29611
| * | | | | New translations gitlab.pot (Turkish)GitLab Crowdin Bot2019-06-131-669/+3436
| | | | | | | | | | | | | | | | | | [skip ci]
| * | | | | New translations gitlab.pot (Spanish)GitLab Crowdin Bot2019-06-131-1979/+4746
| | | | | | | | | | | | | | | | | | [skip ci]
| * | | | | New translations gitlab.pot (Slovak)GitLab Crowdin Bot2019-06-131-227/+3004
| | | | | | | | | | | | | | | | | | [skip ci]
| * | | | | New translations gitlab.pot (Japanese)GitLab Crowdin Bot2019-06-131-629/+3391
| | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | Merge branch 'ce-3861-use-serializers-for-project-group-boards' into 'master'Stan Hu2019-06-136-1/+66
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use serialization for project boards See merge request gitlab-org/gitlab-ce!29263
| * | | | | | Add `to_json` to `represent` method callce-3861-use-serializers-for-project-group-boardscharlieablett2019-06-133-8/+2
| | | | | | |
| * | | | | | Add `to_json` to `represent` method callcharlieablett2019-06-103-3/+3
| | | | | | |
| * | | | | | Use serialization for project boardscharlieablett2019-06-067-1/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add serializers and Grape::Entity - Replace to_json - Add specs
* | | | | | | Merge branch '59733-autofix-i18n-offences-in-js-files-using-eslint' into ↵Mike Greiling2019-06-1314-7/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' "Add ESLint i18n plugin" Closes #62359 See merge request gitlab-org/gitlab-ce!26789
| * | | | | | | Disable unnecessary ESLint i18n offencesBrandon Labuschagne2019-06-1314-7/+46
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unnecessary offences include false positives as well as flagged errors which have follow up issues in order to be addressed. Not all issues have been addressed before this being submitted in the spirit of results and iteration.
* | | | | | | Merge branch '60497-unquarantine-user-edits-files-spec' into 'master'63210-add-explicit-symptom-and-solution-when-geo-database-has-an-outdated-fdw-remote-schemaStan Hu2019-06-131-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove spec/features/projects/files/user_edits_files_spec.rb from quarantine Closes #60497 See merge request gitlab-org/gitlab-ce!29620
| * | | | | | | Unquarantine spec in user_edits_files_spec.rbHeinrich Lee Yu2019-06-141-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'improve-dashboard-caching' into 'master'Douglas Barbosa Alexandre2019-06-135-26/+54
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Refactor for cleaner caching in dashboards See merge request gitlab-org/gitlab-ce!29444
| * | | | | | | Refactor for cleaner caching in dashboardsSarah Yasonik2019-06-135-26/+54
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Opts to cache a full list of cached dashboards to better manage removing items from the cache. This also allows dashboards to be stored in the cache that don't necessarily correspond to a single dashboard yml.
* | | | | | | Merge branch 'pprokic-master-patch-44643' into 'master'Trevor Knudsen2019-06-134-5/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update application-security index.md's (SAST,DAST,LM and DS) See merge request gitlab-org/gitlab-ce!29547