summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch '61145-fix-button-dimensions' into 'master'"revert-af42c169Annabel Dunstone Gray2019-07-161-1/+1
| | | This reverts merge request !28545
* Merge branch 'vue-file-list-breadcrumb-dropdown' into 'master'Filipa Lacerda2019-07-161-0/+32
|\ | | | | | | | | | | | | Added add to tree dropdown to Vue files breadcrumb Closes #62865 See merge request gitlab-org/gitlab-ce!30177
| * Added add to tree dropdown to Vue files breadcrumbPhil Hughes2019-07-151-0/+32
| |
* | Hide restricted and disallowed visibility radioshide-restricted-visibility-radioLuke Bennett2019-07-151-14/+8
|/ | | | | Show a message if many levels are restricted and a different message if all levels are restricted.
* Add more file extentions to file type icon classPeter Dave Hello2019-07-151-9/+12
|
* Open WebIDE in fork when user doesn't have access51952-redirect-to-webide-in-forkMarkus Koller2019-07-121-1/+10
| | | | | | | When opening the IDE on a project where the user doesn't have push access, we create a fork and then redirect back to the IDE. To make sure the user can actually commit, we need to open the IDE in the forked project rather than the upstream project.
* Merge branch '60798-follow-up-simplify-sort-direction-logic' into 'master'Sean McGivern2019-07-121-49/+34
|\ | | | | | | | | | | | | Resolve "Follow up: Simplify sort direction logic" Closes #60798 See merge request gitlab-org/gitlab-ce!30443
| * Minor review cleanup60798-follow-up-simplify-sort-direction-logicEzekiel Kigbo2019-07-121-1/+1
| | | | | | | | Minor refactor specs
| * Added tests for sort icon currentEzekiel Kigbo2019-07-121-26/+20
| | | | | | | | Refactor sort direction icon
| * Added test for admin/projectsEzekiel Kigbo2019-07-121-22/+18
| | | | | | | | | | | | | | | | Added tests with project_list_filter_bar set to off Added tests for projects_sort_option_titles Refactor project sort options hash
| * Added tests for current behaviourEzekiel Kigbo2019-07-121-10/+5
| |
* | Split and prepend CurrentBoardEntityWinnie Hellmann2019-07-121-1/+5
|/ | | | (cherry picked from commit 1e8bdd01bff96122fe80c51fa8f024f18675b58b)
* Moves method to TreeHelperFilipa Lacerda2019-07-111-0/+7
| | | | | Reuses existing TreeHelper instead of creating a new one just for one method.
* Bring buttons style up to design specScott Hampton2019-07-111-1/+1
| | | | | | | | | | | | | | | | This is a CSS effort only. Fixes the padding of the buttons to be `8px 12px` (including border) so that the button height is 32px. Also adjusts the border width for all buttons when the state is `hover`, `focus`, or `active to be 2px thick instead of 1px thick. This is accomplished through an inset box-shadow as not to increase the size of the button. Fixes some colors for primary and tertiary buttons.
* Merge branch 'fix_simple_format_undefined' into 'master'Robert Speicher2019-07-101-4/+8
|\ | | | | | | | | | | | | Fix `simple_format` undefined error #60179 Closes #60179 See merge request gitlab-org/gitlab-ce!30366
| * Extract plain file rendering into a separate methodVasiliy Yakliushin2019-07-071-3/+7
| |
| * Fix undefined method `simple_format for MarkupHelper:ModuleVasiliy Yakliushin2019-07-071-1/+1
| | | | | | | | | | | | | | | | | | `simple_format` is not defined in ActionView::Helpers::TagHelper, but it is actually located in ActionView::Helpers::TextHelper. The solution is to include the correct helper. I've also added tests for `#markup_unsafe` because they were missing.
* | Implemented frontend suggestionsNick Kipling2019-07-091-1/+1
| | | | | | | | | | | | Converted storage details into a small partial Reworded the storage details summary as suggested Updated pot file
* | Remove `:graphql` feature flagcharlie ablett2019-07-091-1/+1
|/ | | | | | | | - Remove `FeatureConstrainer` call wrapping api endpoint - Remove `Feature.enabled?(:graphql)` conditionals in back and frontend - Modify graphql test to be graphql flag agnostic - Remove api routing spec - Remove frontend feature flag via `gon`
* Merge branch 'fetch-forked-projects-create-mr' into 'master'Filipa Lacerda2019-07-051-1/+1
|\ | | | | | | | | | | | | Create private merge requests in forks Closes #58583 See merge request gitlab-org/gitlab-ce!29984
| * Create private merge requests in forksPhil Hughes2019-07-051-1/+1
| | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* | Change 'Todo' to 'To Do'Christie Lenneville2019-07-042-3/+3
|/ | | | | | | | | | | | | | | | 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
* Add Grafana to Admin > Monitoring menu when enabledManeschi Romain2019-07-031-0/+2
|
* Add salesforce logoMałgorzata Ksionek2019-07-031-1/+1
|
* Merge branch 'jc-deprecate-diverging-count-with-max' into 'master'Jan Provaznik2019-07-031-8/+0
|\ | | | | | | | | | | | | Deprecate diverging commit count with max parameter Closes gitaly#1702 See merge request gitlab-org/gitlab-ce!30275
| * Deprecate diverging commit count with max parameterjc-deprecate-diverging-count-with-maxJohn Cai2019-07-021-8/+0
| | | | | | | | | | | | | | In 12.0, we turned the feature flag on that effectively turned off the --max-count flag for the count diverging commits call. Since we have commit graphs turned on, this did not affect preformance negatively. Thus, we want to deprecate the call that passes --max-count
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2019-07-033-3/+10
|\ \ | |/
| * Fix broken specs due to cached application settingsStan Hu2019-07-011-2/+2
| | | | | | | | | | | | The /admin panel will now always return an uncached application setting to ensure it always has the most current info.
| * Add new OnboardingExperimentHelper modulesAsh McKenzie2019-06-281-0/+7
| | | | | | | | | | | | OnboardingExperimentHelpers take care of determining if the current_user should or should not see the new onboarding feature.
| * Remove group_clusters feature flagThong Kuah2019-06-281-1/+1
| | | | | | | | | | | | Now we have terminals for instance and group clusters we can remove the FF now. Deploying to group clusters has been working without complaints too.
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2019-07-032-1/+11
|\ \ | |/ |/|
| * Merge branch 'osw-persist-tmp-snippet-uploads' into 'master'Marin Jankovski2019-07-021-0/+10
| |\ | | | | | | | | | | | | Persist tmp snippet uploads at users See merge request gitlab/gitlabhq!3138
| | * Persist tmp snippet uploadsOswaldo Ferreira2019-06-171-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It persist temporary personal snippets under user/:id namespaces temporarily while creating a upload record to track it. If an user gets removed while it's still a tmp upload, it also gets removed. If the tmp upload is sent, the upload gets moved to personal_snippets/:id as before. The upload record also gets updated to the new model type as well.
| * | Merge branch 'security-59581-related-merge-requests-count' into 'master'Marin Jankovski2019-07-021-1/+1
| |\ \ | | | | | | | | | | | | | | | | Expose merge requests count based on user access See merge request gitlab/gitlabhq!3157
| | * | Expose merge requests count based on user accessAlexandru Croitor2019-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Count issues related merge requests based on user access level. And issue can have related MRs from projects where user does not have access so the number of related merge requests should be adjusted based on user's ability to access the related MRs. https://gitlab.com/gitlab-org/gitlab-ce/issues/59581
* | | | Merge branch '53811-issue-boards-to-core-projects-backend-ce' into 'master'Stan Hu2019-06-271-2/+15
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Move Multiple Issue Boards for Projects to Core See merge request gitlab-org/gitlab-ce!29757
| * | | Move Multiple Issue Boards for Projects to Core53811-issue-boards-to-core-projects-backend-ceAlexandru Croitor2019-06-261-2/+15
| | | | | | | | | | | | | | | | | | | | Refactor code to allow multiple issue boards management for projects in CE
* | | | Merge branch 'refactor/remove-sentry-from-app-settings' into 'master'Stan Hu2019-06-261-4/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Remove Sentry settings from application settings See merge request gitlab-org/gitlab-ce!28447
| * | | refactor: remove Sentry from application settingsRoger Meier2019-06-251-4/+0
| | | |
* | | | Bring Manual Ordering on Issue ListRajat Jain2019-06-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On all the issue lists -- Group, Project and Dashboard -- this change adds a new option for managing the lists. "Manual Ordering" option is added which when flipped on will allow an user to drag and drop issues around to create a relative ordering among them.
* | | | New RecaptchaExperimentHelper modulesAsh McKenzie2019-06-251-0/+7
|/ / / | | | | | | | | | | | | RecaptchaExperimentHelper contains helper methods to assist in the controller and view layers.
* | | Merge branch ↵Filipa Lacerda2019-06-251-3/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63177-follow-up-from-use-scoped-routes-for-labels-and-milestones' into 'master' Resolve "Follow-up from "Use scoped routes for labels and milestones"" Closes #63177 See merge request gitlab-org/gitlab-ce!29983
| * | | Remove baseEndpoint from search dropdwon63177-follow-up-from-use-scoped-routes-for-labels-and-milestonesDmitriy Zaporozhets2019-06-241-3/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Rename to time_tracking_limit_to_hours30355-use-hours-only-for-time-trackingHeinrich Lee Yu2019-06-253-3/+5
| | | | | | | | | | | | | | | | Changes migration and all other places the attribute is used
* | | | Limit time tracking values to hoursJon Kolb2019-06-251-0/+1
| | | | | | | | | | | | | | | | | | | | Adds an instance setting to limit display of time tracking values to hours only
* | | | Eliminate N+1 queries in Dashboard::TodosControllerStan Hu2019-06-241-1/+1
|/ / / | | | | | | | | | | | | | | | | | | This appears to bring down the number of SQL queries on GitLab.com for my Todos page from 672 to 100. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/43042
* | | Show create merge request button on confidential issuesPhil Hughes2019-06-241-0/+14
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* | | Memoize non-existent custom appearancessh-strong-memoize-appearancesStan Hu2019-06-231-1/+4
| | | | | | | | | | | | | | | This saves about 5 SQL calls per page if no custom appearance is specified.
* | | Omit issues links in merge request entity API responseStan Hu2019-06-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The merge request widget has a section that includes which issues may be closed or mentioned based on the merge request description. The problem is that rendering and redacting Markdown can be expensive, especially since the browser polls for the data every 10 seconds. Since these links don't change much and are just nice to have, we only load them on first page load. The frontend will use the existing data if the data doesn't appear on subsequent requests. This saves about 30% of the rendering time of this endpoint, which adds up to significant savings considering that `MergeRequestsController#show.json` is called over a million times a day on GitLab.com. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63546
* | | Render GFM html in GraphQLBob Van Landuyt2019-06-201-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a `markdown_field` to our types. Using this helper will render a model's markdown field using the existing `MarkupHelper` with the context of the GraphQL query available to the helper. Having the context available to the helper is needed for redacting links to resources that the current user is not allowed to see. Because rendering the HTML can cause queries, the complexity of a these fields is raised by 5 above the default. The markdown field helper can be used as follows: ``` markdown_field :note_html, null: false ``` This would generate a field that will render the markdown field `note` of the model. This could be overridden by adding the `method:` argument. Passing a symbol for the method name: ``` markdown_field :body_html, null: false, method: :note ``` It will have this description by default: > The GitLab Flavored Markdown rendering of `note` This could be overridden by passing a `description:` argument. The type of a `markdown_field` is always `GraphQL::STRING_TYPE`.
View Lorry Controller Status