summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
...
| * alias create and update actions to new and editMike Greiling2018-02-161-4/+11
| |
| * Merge branch '42800-change-usage-of-avatar_icon' into 'master'Yorick Peterse2018-02-144-11/+37
| |\ | | | | | | | | | | | | | | | | | | Change all occurrences of ApplicationHelper#avatar_icon to use a User object where possible Closes #42800 See merge request gitlab-org/gitlab-ce!16976
| | * Extract repeated logic into #avatar_icon_for.42800-change-usage-of-avatar_iconAndreas Brandl2018-02-131-0/+12
| | | | | | | | | | | | | | | | | | 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.
| | * Extract method to improve readability.Andreas Brandl2018-02-131-7/+11
| | |
| | * Remove generic #avatar_icon helper.Andreas Brandl2018-02-131-8/+0
| | |
| | * Explicit use of avatar_icon_* calls depending on situation.Andreas Brandl2018-02-131-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Retrieve namespace owner's avatar by owner, not owner#email.Andreas Brandl2018-02-131-1/+1
| | |
| | * 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-7/+17
| | | | | | | | | | | | | | | | | | | | | When we don't use the original `ApplicationHelper#avatar_icon` anymore, we can just remove it (and its specs). Closes #42800.
| * | Merge branch '37050-ext-issue-tracker' into 'master'Sean McGivern2018-02-141-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Display a link to external issue tracker when enabled Closes #37050 See merge request gitlab-org/gitlab-ce!17030
| | * | Display a link to external issue tracker when enabledJarka Kadlecová2018-02-141-0/+4
| | |/
| * | Render modified icon for moved file42314-diff-fileFilipa Lacerda2018-02-131-1/+1
| |/
* | Move button list logic to project presenterOswaldo Ferreira2018-02-205-341/+2
| |
* | Add Auto DevOps and Kubernetes cluster button to project pageEric Eastwood2018-02-161-0/+214
|/
* Merge branch 'zj-refs-hash' into 'master'Sean McGivern2018-02-071-6/+2
|\ | | | | | | | | | | | | 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-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-072-6/+14
|\ \ | |/ |/| | | | | | | | | | | | | into 'master' Resolve "Add domain field to Auto DevOps application setting" Closes #38175 See merge request gitlab-org/gitlab-ce!16604
| * Refactor AutoDevopsHelper.missing_auto_devops_domain?Matija Čupić2018-02-021-1/+1
| |
| * Merge branch 'master' into ↵Matija Čupić2018-02-026-20/+32
| |\ | | | | | | | | | 38175-add-domain-field-to-auto-devops-application-setting
| * \ Merge branch 'master' into ↵Matija Čupić2018-02-025-12/+12
| |\ \ | | | | | | | | | | | | 38175-add-domain-field-to-auto-devops-application-setting
| * | | Rename AutoDevopsHelper helper methodsMatija Čupić2018-02-021-5/+5
| | | |
| * | | Fix AutoDevOpsHelper helper methodsMatija Čupić2018-02-021-5/+5
| | | |
| * | | Add specs for .auto_devops_warning_messageMatija Čupić2018-02-011-6/+13
| | | |
| * | | Merge branch 'master' into ↵Matija Čupić2018-01-283-4/+8
| |\ \ \ | | | | | | | | | | | | | | | 38175-add-domain-field-to-auto-devops-application-setting
| * | | | Expose auto_devops_domain in admin settings viewMatija Čupić2018-01-221-0/+1
| | | | |
* | | | | Merge branch 'fix/show-sidebar-sub-level-items-for-billing' into 'master'Sean McGivern2018-02-061-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Override group sidebar links See merge request gitlab-org/gitlab-ce!16942
| * | | | | Override group sidebar linksGeorge Tsiolis2018-02-061-0/+4
| | | | | |
* | | | | | 31885 - Ability to transfer a single group to another groupMayra Cabrera2018-02-061-0/+13
| | | | | |
* | | | | | Merge branch '41672-emphasize-gke-cluster-to-new-users' into 'master'Clement Ho2018-02-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add feature highlight blue dot to GKE "Clusters" sidebar item Closes #41672 See merge request gitlab-org/gitlab-ce!16379
| * | | | | | Restore feature_highlight code41672-emphasize-gke-cluster-to-new-usersEric Eastwood2018-02-051-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From https://gitlab.com/gitlab-org/gitlab-ce/issues/36760 Was reverted in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14373
* | | | | | Allow moving wiki pages from the UIFrancisco Javier López2018-02-051-0/+18
|/ / / / /
* | | | | Refactor .show_gke_cluster_integration_callout?Matija Čupić2018-02-051-2/+2
| | | | |
* | | | | Change UserCallout feautre_name to enumMatija Čupić2018-02-031-5/+0
| | | | |
* | | | | Merge branch 'master' into persistent-calloutsMatija Čupić2018-02-0210-32/+44
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'webpack-auto-config' into 'master'Jacob Schatz2018-02-021-0/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Automatically Generate Webpack Entry Points See merge request gitlab-org/gitlab-ce!16865
| | * | | | update webpack helper to automatically include route-based entry pointsMike Greiling2018-02-011-0/+18
| | | | | |
| * | | | | use Gitlab::UserSettings directly as a singleton instead of ↵Mario de la Ossa2018-02-025-20/+14
| | |_|_|/ | |/| | | | | | | | | | | | | including/extending it
| * | | | Merge branch 'backport-ee-4644-geo-selective-sync-by-shard' into 'master'Robert Speicher2018-02-011-2/+2
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Backport changes in the application settings helper to CE See merge request gitlab-org/gitlab-ce!16801
| | * | | Refactor repository_storages_options_for_selectNick Thomas2018-01-311-2/+2
| | | | |
| * | | | Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-013-9/+9
| |/ / /
| * | | Make default_avatar return a full path.Felix Geyer2018-01-281-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 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-2/+1
| | |
* | | Remove dismissed_state from Callout modelMatija Čupić2018-02-021-1/+1
| | |
* | | Add callout priority enumMatija Čupić2018-02-011-0/+5
| | |
* | | Extract feature name into constantMatija Čupić2018-01-301-2/+4
| | |
* | | Show GKE cluster callout for project owner as wellMatija Čupić2018-01-301-1/+3
| | |
* | | Add safe navigation for users without callout stateMatija Čupić2018-01-301-1/+1
| | |
* | | Add check for guest userMatija Čupić2018-01-301-1/+1
| | |
* | | Implement CalloutsHelperMatija Čupić2018-01-271-0/+11
|/ /