summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* 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 'feature/require-2fa-for-all-entities-in-group' into 'master'Thong Kuah2019-06-141-1/+1
|\ | | | | | | | | 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-131-1/+1
| |
| * refactor: apply "require 2FA" to all subgroup and ancestor group members, ↵Roger Meier2019-06-132-3/+2
| | | | | | | | when changing
| * remove experiments for 2fa requirements and fix testsRoger Rüttimann2019-06-132-3/+3
| |
| * 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-132-2/+3
| |
* | Breakup first passSarah Groff Hennigh-Palermo2019-06-1413-1/+571
| | | | | | | | It has a lot of files because that's the point
* | Use scoped routes for labels and milestonesDmitriy Zaporozhets2019-06-135-7/+31
| | | | | | | | | | | | Update frontend code to use /-/ scope for milestones and labels routes Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | 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 'sh-omit-blocked-admins-from-notification' into 'master'Robert Speicher2019-06-131-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 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-121-1/+1
| |/ | | | | | | | | | | | | Blocked admins should not receive notifications about failed repository checks. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63019
* | Merge branch 'ce-3861-use-serializers-for-project-group-boards' into 'master'Stan Hu2019-06-134-1/+23
|\ \ | | | | | | | | | | | | 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-131-1/+1
| | |
| * | Add `to_json` to `represent` method callcharlieablett2019-06-101-1/+1
| | |
| * | Use serialization for project boardscharlieablett2019-06-064-1/+23
| | | | | | | | | | | | | | | | | | - Add serializers and Grape::Entity - Replace to_json - Add specs
* | | Disable unnecessary ESLint i18n offencesBrandon Labuschagne2019-06-1311-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Refactor for cleaner caching in dashboardsSarah Yasonik2019-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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 '62690-raise-error-when-creating-mr-diff-fails' into 'master'Douglas Barbosa Alexandre2019-06-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Raise an error if creating the MergeRequestDiff fails See merge request gitlab-org/gitlab-ce!29434
| * | | Raise an error if creating the MergeRequestDiff failsNick Thomas2019-06-131-1/+1
| | | |
* | | | Merge branch 'blob-row-click-to-open' into 'master'Filipa Lacerda2019-06-131-0/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Click file row in repository Vue app to view file See merge request gitlab-org/gitlab-ce!29596
| * | | Click file row in repository Vue app to view filePhil Hughes2019-06-131-0/+3
| | | |
* | | | Merge branch 'ce-12091-remove-elasticsearch-lite-project' into 'master'Sean McGivern2019-06-134-8/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport changes from 'Partially revert d9cb907c: "Avoid loading objects from DB in ES results"' See merge request gitlab-org/gitlab-ce!29597
| * | | | Restore some unrelated changes from d9cb907cNick Thomas2019-06-133-3/+3
| | | | |
| * | | | Revert "Avoid loading objects from DB in ES results"Nick Thomas2019-06-137-11/+4
| |/ / / | | | | | | | | | | | | This reverts commit d9cb907c3e987363065136bafb2156e86bc5de26.
* | | | Modify the branch hooks spec to expect processing of commit messagesFabio Papa2019-06-131-5/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Commit messages are not processed for references to issues when creating the default branch on push. This was expected behavior (probably to avoid performance problems when first pushing a repository with thousands of commits). However, this is not an issue because we always limit the number of commits to process to 100 regardless of whether we are creating the default branch or not.
* | | Add trackEvent when accessing the Register tabAsh McKenzie2019-06-131-1/+1
| |/ |/| | | | | This is a no-op for CE.
* | Remove the grafana_dashboard_link feature flagReuben Pereira2019-06-123-13/+0
| |
* | Adding break-word css to home-panel-description class to correctly word wrap ↵Erik van der Gaag2019-06-121-1/+1
| | | | | | | | long words
* | Merge branch ↵Annabel Dunstone Gray2019-06-121-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '63010-visual-regression-in-12-0-line-numbers-not-lining-up-in-file-view' into 'master' Resolve "Visual regression in 12.0: line numbers not lining up in file view" Closes #63010 See merge request gitlab-org/gitlab-ce!29403
| * | Align line numbers for non-default font size63010-visual-regression-in-12-0-line-numbers-not-lining-up-in-file-viewSimon Knox2019-06-101-3/+3
| | |
* | | Merge branch 'sh-fix-resolve-button-not-available' into 'master'Fatih Acet2019-06-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix "Resolve conflicts" button not appearing for some users Closes #47954 See merge request gitlab-org/gitlab-ce!29535
| * | | Fix "Resolve conflicts" button not appearing for some userssh-fix-resolve-button-not-availableStan Hu2019-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the frontend assumed that the user had to be able to merge to that project in order to resolve conflicts. However, this is overly restrictive, as the user only has to be able to push to the source branch. In fact, appending the text /conflicts to the merge request would bring up the conflict resolution page. This confusion happens when a project contains a protected branch that only allows maintainers to push. Users with Developer access no longer have permission to merge, but they still can create branches in that project. To fix this issue, we now loosen the permission check for the "Resolve conflicts" button and only check for access to push to the source branch. This is consistent with what the backend does in MergeRequests::Conflicts::ListService#can_be_resolved_by?. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47954
* | | | Merge branch 'ealcantara-popover-styling' into 'master'Annabel Dunstone Gray2019-06-127-43/+93
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Style popovers according to the design specs See merge request gitlab-org/gitlab-ce!28375
| * | | | Nest category-icon inside .user-popoverealcantara-popover-stylingEnrique Alcantara2019-06-071-4/+4
| | | | |
| * | | | Cleanup deprecation message popoverEnrique Alcantara2019-06-073-25/+1
| | | | |
| * | | | Extract user-popover stylesEnrique Alcantara2019-06-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Separate use-case specific user-popover styles from general popover styles.
| * | | | Address feature highlight popover inconsistenciesEnrique Alcantara2019-06-073-6/+4
| | | | |
| * | | | Style popovers according to the design specsEnrique Alcantara2019-06-074-15/+87
| | | | | | | | | | | | | | | | | | | | | | | | | - Apply new styles for header, padding, border, and fonts - Remove bootstrap 3 backward compat code
* | | | | Merge branch 'prom-api-3' into 'master'Mike Greiling2019-06-127-13/+117
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch charts to Prometheus API endpoint CE-3 Closes #58516 See merge request gitlab-org/gitlab-ce!29280
| * | | | | Use Prometheus API for dashboard metricsprom-api-3Simon Knox2019-06-077-13/+117
| | | | | | | | | | | | | | | | | | | | | | | | Make API request for each chart
* | | | | | Merge branch 'fix-diverged-branch-locals' into 'master'Stan Hu2019-06-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix diverged branch locals See merge request gitlab-org/gitlab-ce!29508
| * | | | | | Fix diverged branch localsfix-diverged-branch-localsLuke Bennett2019-06-121-1/+1
| | | | | | |
* | | | | | | Merge branch 'prom-api-2' into 'master'Mike Greiling2019-06-129-7/+80
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Switch charts to Prometheus API endpoint CE-2 See merge request gitlab-org/gitlab-ce!29226
| * | | | | | Add feature flag and dashboard endpointprom-api-2Simon Knox2019-06-079-7/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First part of FE for Prometheus API Dashboard endpoint fetches all info except for chart results Renders empty groups after loading
* | | | | | | Whitelist query limiting admin usage data endpointPeter Leitzen2019-06-121-0/+6
| | | | | | |
* | | | | | | Extract ide_status_list from ide_status_barPaul Slaughter2019-06-124-23/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** The ide_status_list will be used and extended in EE.
* | | | | | | Resolve "Email notifications do not work properly (issue due date)"Eugenia Grieff2019-06-121-2/+3
| | | | | | |
* | | | | | | Merge branch '59651-remove-unnecessary-decimal-places-on-chart-axes' into ↵Phil Hughes2019-06-121-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Remove unnecessary decimal places on chart axes" Closes #59651 See merge request gitlab-org/gitlab-ce!29468
View Lorry Controller Status