Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | alias create and update actions to new and edit | Mike Greiling | 2018-02-16 | 1 | -4/+11 | |
| | | ||||||
| * | Merge branch '42800-change-usage-of-avatar_icon' into 'master' | Yorick Peterse | 2018-02-14 | 4 | -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_icon | Andreas Brandl | 2018-02-13 | 1 | -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 Brandl | 2018-02-13 | 1 | -7/+11 | |
| | | | ||||||
| | * | Remove generic #avatar_icon helper. | Andreas Brandl | 2018-02-13 | 1 | -8/+0 | |
| | | | ||||||
| | * | Explicit use of avatar_icon_* calls depending on situation. | Andreas Brandl | 2018-02-13 | 1 | -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 Brandl | 2018-02-13 | 1 | -1/+1 | |
| | | | ||||||
| | * | Use more specific #avatar_icon_for_user. | Andreas Brandl | 2018-02-13 | 1 | -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 Brandl | 2018-02-13 | 1 | -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 McGivern | 2018-02-14 | 1 | -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 enabled | Jarka Kadlecová | 2018-02-14 | 1 | -0/+4 | |
| | |/ | ||||||
| * | | Render modified icon for moved file42314-diff-file | Filipa Lacerda | 2018-02-13 | 1 | -1/+1 | |
| |/ | ||||||
* | | Move button list logic to project presenter | Oswaldo Ferreira | 2018-02-20 | 5 | -341/+2 | |
| | | ||||||
* | | Add Auto DevOps and Kubernetes cluster button to project page | Eric Eastwood | 2018-02-16 | 1 | -0/+214 | |
|/ | ||||||
* | Merge branch 'zj-refs-hash' into 'master' | Sean McGivern | 2018-02-07 | 1 | -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_hash | Zeger-Jan van de Weg | 2018-02-07 | 1 | -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ński | 2018-02-07 | 2 | -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-02 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'master' into ↵ | Matija Čupić | 2018-02-02 | 6 | -20/+32 | |
| |\ | | | | | | | | | | 38175-add-domain-field-to-auto-devops-application-setting | |||||
| * \ | Merge branch 'master' into ↵ | Matija Čupić | 2018-02-02 | 5 | -12/+12 | |
| |\ \ | | | | | | | | | | | | | 38175-add-domain-field-to-auto-devops-application-setting | |||||
| * | | | Rename AutoDevopsHelper helper methods | Matija Čupić | 2018-02-02 | 1 | -5/+5 | |
| | | | | ||||||
| * | | | Fix AutoDevOpsHelper helper methods | Matija Čupić | 2018-02-02 | 1 | -5/+5 | |
| | | | | ||||||
| * | | | Add specs for .auto_devops_warning_message | Matija Čupić | 2018-02-01 | 1 | -6/+13 | |
| | | | | ||||||
| * | | | Merge branch 'master' into ↵ | Matija Čupić | 2018-01-28 | 3 | -4/+8 | |
| |\ \ \ | | | | | | | | | | | | | | | | 38175-add-domain-field-to-auto-devops-application-setting | |||||
| * | | | | Expose auto_devops_domain in admin settings view | Matija Čupić | 2018-01-22 | 1 | -0/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'fix/show-sidebar-sub-level-items-for-billing' into 'master' | Sean McGivern | 2018-02-06 | 1 | -0/+4 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Override group sidebar links See merge request gitlab-org/gitlab-ce!16942 | |||||
| * | | | | | Override group sidebar links | George Tsiolis | 2018-02-06 | 1 | -0/+4 | |
| | | | | | | ||||||
* | | | | | | 31885 - Ability to transfer a single group to another group | Mayra Cabrera | 2018-02-06 | 1 | -0/+13 | |
| | | | | | | ||||||
* | | | | | | Merge branch '41672-emphasize-gke-cluster-to-new-users' into 'master' | Clement Ho | 2018-02-05 | 1 | -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-users | Eric Eastwood | 2018-02-05 | 1 | -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 UI | Francisco Javier López | 2018-02-05 | 1 | -0/+18 | |
|/ / / / / | ||||||
* | | | | | Refactor .show_gke_cluster_integration_callout? | Matija Čupić | 2018-02-05 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Change UserCallout feautre_name to enum | Matija Čupić | 2018-02-03 | 1 | -5/+0 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into persistent-callouts | Matija Čupić | 2018-02-02 | 10 | -32/+44 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | Merge branch 'webpack-auto-config' into 'master' | Jacob Schatz | 2018-02-02 | 1 | -0/+18 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Automatically Generate Webpack Entry Points See merge request gitlab-org/gitlab-ce!16865 | |||||
| | * | | | | update webpack helper to automatically include route-based entry points | Mike Greiling | 2018-02-01 | 1 | -0/+18 | |
| | | | | | | ||||||
| * | | | | | use Gitlab::UserSettings directly as a singleton instead of ↵ | Mario de la Ossa | 2018-02-02 | 5 | -20/+14 | |
| | |_|_|/ | |/| | | | | | | | | | | | | | including/extending it | |||||
| * | | | | Merge branch 'backport-ee-4644-geo-selective-sync-by-shard' into 'master' | Robert Speicher | 2018-02-01 | 1 | -2/+2 | |
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Backport changes in the application settings helper to CE See merge request gitlab-org/gitlab-ce!16801 | |||||
| | * | | | Refactor repository_storages_options_for_select | Nick Thomas | 2018-01-31 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Enable RuboCop Style/RegexpLiteral | Takuya Noguchi | 2018-02-01 | 3 | -9/+9 | |
| |/ / / | ||||||
| * | | | Make default_avatar return a full path. | Felix Geyer | 2018-01-28 | 1 | -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 UserCallout | Matija Čupić | 2018-02-02 | 1 | -1/+1 | |
| | | | ||||||
* | | | Use policies instead of role checks in ClustersHelper | Matija Čupić | 2018-02-02 | 1 | -2/+1 | |
| | | | ||||||
* | | | Remove dismissed_state from Callout model | Matija Čupić | 2018-02-02 | 1 | -1/+1 | |
| | | | ||||||
* | | | Add callout priority enum | Matija Čupić | 2018-02-01 | 1 | -0/+5 | |
| | | | ||||||
* | | | Extract feature name into constant | Matija Čupić | 2018-01-30 | 1 | -2/+4 | |
| | | | ||||||
* | | | Show GKE cluster callout for project owner as well | Matija Čupić | 2018-01-30 | 1 | -1/+3 | |
| | | | ||||||
* | | | Add safe navigation for users without callout state | Matija Čupić | 2018-01-30 | 1 | -1/+1 | |
| | | | ||||||
* | | | Add check for guest user | Matija Čupić | 2018-01-30 | 1 | -1/+1 | |
| | | | ||||||
* | | | Implement CalloutsHelper | Matija Čupić | 2018-01-27 | 1 | -0/+11 | |
|/ / |