summaryrefslogtreecommitdiff
path: root/spec/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '43246-checkfilter' into 'master'Sean McGivern2018-04-061-25/+4
|\ | | | | | | | | | | | | Resolve "Show a message when loading the issues / merge requests dashboard without filters" Closes #43246 See merge request gitlab-org/gitlab-ce!17961
| * Fixed dashboard filtering testsJan Provaznik2018-04-031-25/+4
| |
* | Merge branch '42028-xss-diffs-10-6' into 'security-10-6'Douwe Maan2018-04-051-2/+28
| | | | | | | | | | Port of "Fix XSS on commit diff view" for 10-6 See merge request gitlab/gitlabhq!2364
* | Fix links to subdirectories of a directory with a plus character in its pathdm-flatten-tree-plus-charsDouwe Maan2018-04-041-0/+10
|/
* Merge branch 'add-canary-favicon' into 'master'Sean McGivern2018-03-291-0/+5
|\ | | | | | | | | Add canary favicon See merge request gitlab-org/gitlab-ce!12477
| * Update styling and use Gitlab::Utils.to_booleanEric Eastwood2018-03-271-0/+5
| |
* | 'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choicesElias Werberich2018-03-271-1/+3
|/
* Fix import helper spec when a previous spec stubs settingsSean McGivern2018-03-151-4/+2
| | | | This should use stub_omniauth_setting, not do it manually.
* Merge branch 'rd-fix-github-url-when-listing-repositories-at-importing' into ↵Douwe Maan2018-03-121-5/+28
|\ | | | | | | | | | | | | 'master' Fix provider server URL used when listing repos to import See merge request gitlab-org/gitlab-ce!17692
| * Fix provider server URL used when listing repos to importrd-fix-github-url-when-listing-repositories-at-importingRubén Dávila2018-03-121-5/+28
| | | | | | | | Also use Gitlab::Auth::OAuth::Provider.config_for to access OmniAuth config
* | Add helpers for labels dropdownKushal Pandya2018-03-121-0/+72
|/
* Allow maintainers to edit directly in a forkBob Van Landuyt2018-03-071-0/+9
|
* Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-062-7/+7
|\ | | | | | | | | # Conflicts: # app/models/group.rb # db/schema.rb
| * Replace deprecated name_with_namespace with full_name in app and specDmitriy Zaporozhets2018-03-052-7/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Bring one group board to CEFelipe Artur2018-03-031-0/+28
|/
* Remove u2f webpack bundleMike Greiling2018-03-011-49/+0
|
* Merge branch '41255-refactoring-of-blob-link-methods-in-blob_helper' into ↵Douwe Maan2018-02-261-4/+4
|\ | | | | | | | | | | | | | | | | 'master' Resolve "Refactoring of blob link methods in blob_helper" Closes #41255 See merge request gitlab-org/gitlab-ce!16851
| * refactor methods inline41255-refactoring-of-blob-link-methods-in-blob_helperJames Lopez2018-02-231-1/+1
| |
| * refactor code based on feedbackJames Lopez2018-02-231-4/+4
| |
| * some initial refactoringJames Lopez2018-02-231-5/+5
| |
* | Don't convert issuable_initial_data into JSONjprovazn-issuable-dataJan Provaznik2018-02-261-16/+16
|/ | | | | | | | | | Instead of converting hash into JSON inside issuable_initial_data method, return hash and convert to JSON later. This allows us to easily extend basic issuable data with resource specific values. For example for Epic these data should include also labels, so we can then do something like: issuable_initial_data(@epic).merge(labels: @epic.labels).to_json
* Merge branch 'bvl-external-auth-port' into 'master'Douwe Maan2018-02-237-15/+153
|\ | | | | | | | | Port `read_cross_project` ability from EE See merge request gitlab-org/gitlab-ce!17208
| * Port `read_cross_project` ability from EEBob Van Landuyt2018-02-227-15/+153
| |
* | Add Tip about Push to Create project on New Project pageAndré Luís2018-02-231-0/+16
| |
* | Merge branch 'master' into 42431-add-auto-devops-and-clusters-button-to-projectsEric Eastwood2018-02-224-14/+54
|\ \ | |/
| * Escape HTML entities in commit messagesDouwe Maan2018-02-151-0/+4
| |
| * Extract repeated logic into #avatar_icon_for.42800-change-usage-of-avatar_iconAndreas Brandl2018-02-131-0/+16
| | | | | | | | | | | | This essentially allows to pass both user and email, so that we can either prefer the user to retrieve the avatar or (if user is not present) fall back to the email lookup.
| * Remove generic #avatar_icon helper.Andreas Brandl2018-02-131-28/+0
| |
| * Explicit use of avatar_icon_* calls depending on situation.Andreas Brandl2018-02-131-8/+8
| | | | | | | | | | | | | | | | | | | | We want to drop the generic #avatar_icon helper that supports both an email and a user object being passed in. Instead, we want to explicitly use the #avatar_icon_for_user and #avatar_icon_for_email helpers depending on what we have at hand. This allows us to avoid unnecessary database queries (e.g. call User.find_by_any_email if we already have the user). In situations like here, this makes it less convenient to use.
| * Use more specific #avatar_icon_for_user.Andreas Brandl2018-02-131-1/+1
| | | | | | | | | | Whenever we already deal with a User object, let's use the more specific method avatar_icon_for_user.
| * Refactor and split ApplicationHelper#avatar_icon.Andreas Brandl2018-02-131-0/+48
| | | | | | | | | | | | | | When we don't use the original `ApplicationHelper#avatar_icon` anymore, we can just remove it (and its specs). Closes #42800.
* | Move default_project_view tests to presenterOswaldo Ferreira2018-02-201-97/+0
| |
* | Move button list logic to project presenterOswaldo Ferreira2018-02-201-26/+0
|/
* Merge branch 'zj-refs-hash' into 'master'Sean McGivern2018-02-071-3/+3
|\ | | | | | | | | | | | | Don't use rugged in Repository#refs_hash Closes gitaly#880 See merge request gitlab-org/gitlab-ce!16827
| * Don't use rugged in Repository#refs_hashZeger-Jan van de Weg2018-02-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The refs hash is used to determine what branches and tags have a commit as head in the network graph. The previous implementation depended on Rugged#references. The problem with this implementation was that it depended on rugged, but also that it iterated over all references and thus loading more data than needed if for example the project uses CI/CD environments, Pipelines, or Merge Requests. Given only refs are checked the network cares about the GraphHelper#refs method has no need to reject those, simplifying the method. Closes gitlab-org/gitaly#880
* | Merge branch '38175-add-domain-field-to-auto-devops-application-setting' ↵Kamil Trzciński2018-02-071-0/+35
|\ \ | |/ |/| | | | | | | | | | | | | into 'master' Resolve "Add domain field to Auto DevOps application setting" Closes #38175 See merge request gitlab-org/gitlab-ce!16604
| * Merge branch 'master' into ↵Matija Čupić2018-02-021-2/+2
| |\ | | | | | | | | | 38175-add-domain-field-to-auto-devops-application-setting
| * \ Merge branch 'master' into ↵Matija Čupić2018-02-024-6/+6
| |\ \ | | | | | | | | | | | | 38175-add-domain-field-to-auto-devops-application-setting
| * | | Rename AutoDevopsHelper helper methodsMatija Čupić2018-02-021-5/+5
| | | |
| * | | Add specs for .auto_devops_warning_messageMatija Čupić2018-02-011-0/+35
| | | |
* | | | Refactor .show_gke_cluster_integration_callout?Matija Čupić2018-02-051-18/+10
| | | |
* | | | Merge branch 'master' into persistent-calloutsMatija Čupić2018-02-024-8/+8
|\ \ \ \ | | |_|/ | |/| |
| * | | use Gitlab::UserSettings directly as a singleton instead of ↵Mario de la Ossa2018-02-021-2/+2
| | |/ | |/| | | | | | | including/extending it
| * | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-013-4/+4
| | |
| * | Make default_avatar return a full path.Felix Geyer2018-01-281-2/+2
| |/ | | | | | | | | | | | | | | | | Callers expect a URL. This fixes the avatars in commit lists when a user has no avatar and Gravatar is disabled. Closes #38715
* | Rename Callout to UserCalloutMatija Čupić2018-02-021-1/+1
| |
* | Use policies instead of role checks in ClustersHelperMatija Čupić2018-02-021-16/+8
| |
* | Fix CalloutsHelper spec subjectMatija Čupić2018-01-301-1/+1
| |
* | Show GKE cluster callout for project owner as wellMatija Čupić2018-01-301-3/+13
| |
* | Add check for guest userMatija Čupić2018-01-301-0/+8
| |
View Lorry Controller Status