summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-peek-on-puma' into 'master'Rémy Coutable2019-09-021-3/+1
|\ | | | | | | | | | | | | Fix Peek on Puma Closes #66528 See merge request gitlab-org/gitlab-ce!32213
| * Make performance bar enabled checks consistentSean McGivern2019-08-281-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we called the `peek_enabled?` method like so: prepend_before_action :set_peek_request_id, if: :peek_enabled? Now we don't have a `set_peek_request_id` method, so we don't need that line. However, the `peek_enabled?` part had a side-effect: it would also populate the request store cache for whether the performance bar was enabled for the current request or not. This commit makes that side-effect explicit, and replaces all uses of `peek_enabled?` with the more explicit `Gitlab::PerformanceBar.enabled_for_request?`. There is one spec that still sets `SafeRequestStore[:peek_enabled]` directly, because it is contrasting behaviour with and without a request store enabled. The upshot is: 1. We still set the value in one place. We make it more explicit that that's what we're doing. 2. Reading that value uses a consistent method so it's easier to find in future.
* | Fix for #56295, https://gitlab.com/gitlab-org/gitlab-ce/issues/56295.Jesse Hall2019-08-301-4/+5
| | | | | | | | All avatars now visible in commit trailers.
* | Improve search result labelsMarkus Koller2019-08-301-1/+40
| | | | | | | | | | | | | | - Use "results" instead of "blobs", "wiki blobs", "snippet blobs" - Use "comments" instead of "notes" - Use correct pluralization - Don't add "1 - 10 of" if there's only one page
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-08-293-1/+10
|\ \
| * \ Merge branch 'security-enable-image-proxy' into 'master'GitLab Release Tools Bot2019-08-291-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Use image proxy to mitigate stealing ip addresses Closes #2812 See merge request gitlab/gitlabhq!2926
| | * | Add support for using a Camo proxy serverBrett Walker2019-08-231-0/+4
| | |/ | | | | | | | | | | | | | | | User images and videos will get proxied through the Camo server in order to keep malicious sites from collecting the IP address of users.
| * | Merge branch 'security-fix-html-injection-for-label-description-ce-master' ↵GitLab Release Tools Bot2019-08-291-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix HTML injection for label description See merge request gitlab/gitlabhq!3250
| | * | Fix HTML injection for label descriptionPatrick Derichs2019-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add changelog entry Add spec
| * | | Merge branch 'security-59549-add-capcha-for-failed-logins' into 'master'GitLab Release Tools Bot2019-08-291-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Require a captcha after unique failed logins from the same IP See merge request gitlab/gitlabhq!3270
| | * | | Add captcha if there are multiple failed login attemptsMałgorzata Ksionek2019-07-311-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add method to store session ids by ip Add new specs for storing session ids Add cleaning up records after login Add retrieving anonymous sessions Add login recaptcha setting Add new setting to sessions controller Add conditions for showing captcha Add sessions controller specs Add admin settings specs for login protection Add new settings to api Add stub to devise spec Add new translation key Add cr remarks Rename class call Add cr remarks Change if-clause for consistency Add cr remarks Add code review remarks Refactor AnonymousSession class Add changelog entry Move AnonymousSession class to lib Move store unauthenticated sessions to sessions controller Move link to recaptcha info Regenerate text file Improve copy on the spam page Change action filter for storing anonymous sessions Fix rubocop offences Add code review remarks
| * | | Merge branch 'security-hide_merge_request_ids_on_emails' into 'master'GitLab Release Tools Bot2019-08-291-0/+4
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Prevent disclosure of merge request id via email See merge request gitlab/gitlabhq!3313
| | * | Prevent disclosure of merge request id via emailFelipe Artur2019-08-191-0/+4
| | | | | | | | | | | | | | | | | | | | Do not disclosure merge request id via email for unauthorized users when closing issues.
* | | | fix: show preferred commit email in empty project pageYuping Zuo2019-08-291-1/+1
| | | |
* | | | Merge branch 'id-change-total-notes-calculation' into 'master'Ash McKenzie2019-08-281-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Change the way totalNotes is calculated See merge request gitlab-org/gitlab-ce!32191
| * | | | Change the way totalNotes is calculatedid-change-total-notes-calculationIgor Drozdov2019-08-281-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | totalNotes is only used to prerender a number of skeleton containers until real notes are loaded issuable.discussions makes multiple requests, so too expensive for this This commit uses mere notes for this and sends actual totalNotes number if it's less than 10; otherwise it sends 10 - it allows us to avoid bunch of skeleton prerenderings, which are not necessary since they doesn't fit into the whole screen and disappear quite fast
* | | | Merge branch 'todos/include-issue-mr-titles' into 'master'Stan Hu2019-08-281-1/+17
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Add Issue and Merge Request titles to Todo items Closes #63488 See merge request gitlab-org/gitlab-ce!30435
| * | | Add Issue and Merge Request titles to Todo itemsArun Kumar Mohan2019-08-271-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | Only displays the todo body if the todo has a note. This is to avoid redundant Issue or Merge Request titles displayed both in the Todo title and body.
* | | | Merge branch 'fe-fix-issuable-sidebar-icon-of-notification-disabled' into ↵Mike Greiling2019-08-231-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix issuable sidebar icon of notification disabled See merge request gitlab-org/gitlab-ce!32134
| * | | | Fix issuable sidebar icon of notification disabledPaul Slaughter2019-08-231-2/+2
| | | | | | | | | | | | | | | | | | | | by adding the proper notification icon
* | | | | Change misleading pipeline status tooltipScott Hampton2019-08-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some pipeline status icon tooltips were showing "Commit: ..." which customers found to be misleading since it was not the commit that was failing but the pipeline. We are changing all status icon tooltips to say "Pipeline: ..." instead of "Commit: ..." now.
* | | | | Update GitHub CI/CD import page to use PAT onlyScott Hampton2019-08-221-7/+4
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oauth2 tokens are causing issues with mirroring repos, because it effectively limits the number of repos you can mirror. Personal Access Tokens do not have this problem. This change removes the OAuth2 option from the import page for CI/CD only, and only provides the personal access token form.
* | | | Backport: Issue sidebar trackingDonald Cook2019-08-211-1/+5
|/ / / | | | | | | | | | Added snowplow event tracking to Edit buttons
* | | UI for disabling group/project email notificationBrett Walker2019-08-173-2/+27
| | | | | | | | | | | | | | | | | | - Adds UI to configure in group and project settings - Removes notification configuration for users when disabled at group or project level
* | | CE-specific changes to allow design Todos13494-todo-s-not-rendering-when-there-is-a-design-management-related-todo-ceLuke Duncalfe2019-08-151-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | CE-specific changes for: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15129 Co-Authored-By: Alex Kalderimis <akalderimis@gitlab.com> Co-Authored-By: Luke Duncalfe <lduncalfe@eml.cc>
* | | Add link to resend confirmation emailAlex Buijs2019-08-141-0/+7
| | | | | | | | | | | | | | | This link is shown when a user tries to login with an unconfirmed email address and the grace period has expired
* | | Migrates Snowplow backend from EE to CEJeremy Jackson2019-08-142-2/+21
| | | | | | | | | | | | | | | This introduces several changes, but these are all just ported from the EE project.
* | | Revert "Merge branch '64341-data-and-privacy-agreement-for-gitlab-users' ↵Kushal Pandya2019-08-141-6/+0
| | | | | | | | | | | | | | | | | | into 'master'" This reverts merge request !30808
* | | Add notification for updated privacy policyDennis Tang2019-08-141-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | This adds a notification to let users know of our updated privacy policy. Users can dismiss the notification either by following the link or closing the notification via an "x" icon.
* | | FE fetch counts async on search page loadPaul Slaughter2019-08-121-4/+3
| | | | | | | | | | | | | | | Creates `refresh_counts` module to dynamically fetch and load data based on attributes of HAML elements.
* | | Load search result counts asynchronouslyMarkus Koller2019-08-121-14/+21
| | | | | | | | | | | | | | | | | | Querying all counts for the different search results in the same request led to timeouts, so we now only calculate the count for the *current* search results, and request the others in separate asynchronous calls.
* | | Merge branch '39217-remove-kubernetes-service-integration' into 'master'James Lopez2019-08-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Remove KubernetesService integration See merge request gitlab-org/gitlab-ce!31365
| * | | Final removal of KubernetesService39217-remove-kubernetes-service-integrationTiger2019-08-081-1/+1
| |/ / | | | | | | | | | | | | | | | Creating new records has been disabled, and all existing records been migrated to clusters as of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28534
* | | Add pagination to {project}/starrers viewCamil Staps2019-08-072-5/+5
| | |
* | | Change sorting options for starrers: name (asc/desc), most/least recent starCamil Staps2019-08-071-0/+17
| | |
* | | Add "Starred projects" tab to user overviewCamil Staps2019-08-071-1/+1
| | |
* | | Add /starrers view for projectsCamil Staps2019-08-071-0/+5
|/ /
* | Add backwards compatibility for legacy settingGeorge Koltsov2019-08-021-0/+1
| | | | | | | | | | `allow_local_requests_for_hooks_and_services` was renamed to `allow_local_requests_for_web_hooks_and_services`.
* | Add outbound requests setting for system hooksGeorge Koltsov2019-08-021-1/+2
|/ | | | | | | This MR adds new application setting to network section `allow_local_requests_from_system_hooks`. Prior to this change system hooks were allowed to do local network requests by default and we are adding an ability for admins to control it.
* Merge branch ↵Robert Speicher2019-07-291-0/+1
|\ | | | | | | | | | | | | | | | | '63547-add-system-notes-for-when-a-zoom-call-was-added-removed-from-an-issue' into 'master' Resolve "Add system notes for when a zoom call was added/removed from an issue" Closes #63547 See merge request gitlab-org/gitlab-ce!30857
| * Add system notes for when a zoom call was added/removed from an issue63547-add-system-notes-for-when-a-zoom-call-was-added-removed-from-an-issueJacopo2019-07-291-0/+1
| | | | | | | | | | Add a zoom link added / removed system note when a zoom link is being added / removed to the issue description.
* | Change qa-reverse-sort class references to rspec-reverse-sortTanya Pazitny2019-07-292-2/+2
| |
* | Merge branch 'remove-nested-groups-checks' into 'master'Lin Jen-Shin2019-07-261-4/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove code related to object hierarchy and MySQL Closes #65056 and #65055 See merge request gitlab-org/gitlab-ce!31095
| * | Remove code related to object hierarchy in MySQLremove-nested-groups-checksHeinrich Lee Yu2019-07-251-4/+0
| | | | | | | | | | | | | | | These are not required because MySQL is not supported anymore
* | | Fix error rendering submodules in MR diffs when there is no .gitmodulesdm-submodule-links-nilDouwe Maan2019-07-261-0/+2
|/ / | | | | | | Without this change, we get a NoMethodError on nil
* | Changed `author_avatar` to inline-block classMarc Schwede2019-07-241-1/+1
| | | | | | | | Fixes #64746
* | Merge branch '62217-follow-up-from-fix-display-of-promote-to-group-label' ↵Douwe Maan2019-07-241-3/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Remove project param from `#show_label_issuables_link?` Closes #62217 See merge request gitlab-org/gitlab-ce!31038
| * | Remove project from show_label_issuables_link?62217-follow-up-from-fix-display-of-promote-to-group-labelHeinrich Lee Yu2019-07-231-3/+2
| | | | | | | | | | | | The project param is unnecessary here
* | | [ADD] outbound requests whitelistReuben Pereira2019-07-241-0/+1
| | | | | | | | | | | | Signed-off-by: Istvan szalai <istvan.szalai@savoirfairelinux.com>
* | | Add links in admin area overviewce-xanf-add-admin-area-linksIllya Klymov2019-07-241-0/+15
|/ / | | | | | | | | | | Introduces new `feature_entry` helper for dashboard. This helper reduces code duplication when listing available features and relevant links to configuration sections