summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sh-fix-issue-63158' into 'master'Rémy Coutable2019-06-171-1/+17
|\ | | | | | | | | | | | | Fix inability to set visibility_level on project via API Closes #63158 See merge request gitlab-org/gitlab-ce!29578
| * Fix inability to set visibility_level on project via APIsh-fix-issue-63158Stan Hu2019-06-141-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider the scenario: 1. The default visibility level is set to internal 2. A user attempts to create a private project within a private group Previously this would always fail because default_value_for would overwrite the private visibility setting, no matter what visibility_level were specified. This was happening because default_value_for was confused by the default value of 0 specified by the database schema. default_value_for attempts to assign the default value in the block by checking whether the attribute has changed. The problem is that since the default value by the database was 0, and the user requested 0, this appeared as though no changes were made. As a result, default_value_for would always overwrite the user's preference. To fix this, we remove the use of default_value_for and only set the visibility level to the default application setting when no preference has been given at creation time. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63158
* | Merge branch 'revert-3a50fc5d' into 'master'Filipa Lacerda2019-06-179-81/+16
|\ \ | | | | | | | | | | | | Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'" See merge request gitlab-org/gitlab-ce!29684
| * | Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'"revert-3a50fc5dKamil Trzciński2019-06-149-81/+16
| | | | | | | | | This reverts merge request !26853
* | | Merge branch '62910-task-completion-status-gql-pderichs' into 'master'Sean McGivern2019-06-173-0/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make task completion status available via GraphQL Closes #62910 See merge request gitlab-org/gitlab-ce!29573
| * | | Add task count and completed count to graphql types62910-task-completion-status-gql-pderichsPatrick Derichs2019-06-153-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add specs for task completion status (graphql) Fix style issues Changed format of constants in spec Refactor specs to reduce creation of records Reduce parameters to merge request creation Use set's for project and user Move let's out of it_behaves_like block Fix description parameter Fix format of lets Use dig to get task completion status out of graphql response Modified rspec output Add changelog entry
* | | | Merge branch 'gitlab-ui-259-style-checkboxes' into 'master'Kushal Pandya2019-06-171-3/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make changes suggested by Pedro for UX See merge request gitlab-org/gitlab-ce!29324
| * | | | Apply improved styling based on UX feedbackgitlab-ui-259-style-checkboxesSam Bigelow2019-06-121-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Only apply extra margins and borders between checkbox components - Change cursor to `not-allowed` when checkbox is disabled - Adjust handling of inline checkbox styling vs block
* | | | | Backport: Pendo POC snippetDonald Cook2019-06-151-0/+1
| | | | |
* | | | | Merge branch '57813-merge-request-tabs-do-not-handle-ctrl-click-correctly' ↵Fatih Acet2019-06-141-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Merge request tabs do not handle ctrl+click correctly" Closes #57813 See merge request gitlab-org/gitlab-ce!29506
| * | | | | Allow command and control click to work on MR tabs57813-merge-request-tabs-do-not-handle-ctrl-click-correctlySam Bigelow2019-06-121-5/+5
| |/ / / /
* | | | | Do not blindly expose public project statisticsMayra Cabrera2019-06-143-1/+8
| | | | | | | | | | | | | | | | | | | | Add the missing check on GraphQL API for project statistics
* | | | | Merge branch 'bvl-comments-graphql' into 'master'Jan Provaznik2019-06-1412-12/+171
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose comments on Noteables in GraphQL Closes #62825 See merge request gitlab-org/gitlab-ce!29212
| * | | | | Expose comments on Noteables in GraphQLBob Van Landuyt2019-06-1412-12/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This exposes `Note`s on Issues & MergeRequests using a `Types::Notes::NoteableType` in GraphQL. Exposing notes on a new type can be done by implementing the `NoteableType` interface on the type. The presented object should be a `Noteable`.
* | | | | | Renumber a new UserCallout enum for EE compatibility12173-renumber-user-callout-enumNick Thomas2019-06-141-1/+4
| | | | | |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2019-06-1518-82/+212
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 62966-embed-zoom-call-in-issue-mvc
| * \ \ \ \ \ Merge branch 'diff-suggestions-popover' into 'master'Filipa Lacerda2019-06-1416-73/+188
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added diff suggestion popover Closes #56523 See merge request gitlab-org/gitlab-ce!29473
| | * | | | | | Added diff suggestion popoverPhil Hughes2019-06-1416-73/+188
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
| * | | | | | Upgrade gitlab-ui and migrate gl-paginationPaul Gascou-Vaillancourt2019-06-142-9/+24
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Upgraded gitlab-ui to v4.0.0 - Migrated pagination_links to reflect breaking changes introduced in gitlab-ui v4.0.0
* | | | | | Add Join meeting button to Issues with Zoom links62966-embed-zoom-call-in-issue-mvcSimon Knox2019-06-143-0/+56
|/ / / / / | | | | | | | | | | | | | | | | | | | | Detect links containing zoom.us followed by j, s, or my Add link below Issue title that links to Zoom meeting
* | | | | Merge branch 'gt-fix-styling-for-pages-detail-page' into 'master'Filipa Lacerda2019-06-141-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix styling for `app/assets/stylesheets/pages/detail_page.scss` Closes #59900 See merge request gitlab-org/gitlab-ce!26870
| * | | | | Remove unused selectorGeorge Tsiolis2019-06-131-1/+0
| | | | | |
* | | | | | Fix missing deployment rockets in monitor dashboardDhiraj Bodicherla2019-06-143-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed inconsistencies in variable names for deployment endpoints for monitoring dashboard which causes deployment rocket icons to disappear
* | | | | | Add basic support for AsciiDoc include directiveGuillaume Grossetie2019-06-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | See http://asciidoctor.org/docs/user-manual/#include-directive
* | | | | | Merge branch 'fix-flyout-navs' into 'master'Phil Hughes2019-06-143-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix sidebar flyout navigation See merge request gitlab-org/gitlab-ce!29571
| * | | | | | Fix sidebar flyout navigationfix-flyout-navsLuke Bennett2019-06-133-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Show flyout nav for active item when collapsed.
* | | | | | | Merge branch 'fix-sticky-tabs-position' into 'master'Phil Hughes2019-06-141-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update height of $mr-tabs-height See merge request gitlab-org/gitlab-ce!29619
| * | | | | | | Update height of -tabs-heightfix-sticky-tabs-positionAnnabel Dunstone Gray2019-06-131-1/+1
| |/ / / / / /
* | | | | | | Backport of EE changes from MR 13763Walmyr2019-06-142-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13763
* | | | | | | 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
| | | | | |
View Lorry Controller Status