summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Render modified icon for moved file42314-diff-fileFilipa Lacerda2018-02-131-1/+1
|
* 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
|/ /
* | Merge branch 'fix-local-rspec-tests' into 'master'Mike Greiling2018-01-261-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix local RSpec tests due to bug in `webpack_bundle_tag` Closes #42368 See merge request gitlab-org/gitlab-ce!16724
| * | fix bug in webpack_helper in which force_same_domain argument was ignored ↵fix-local-rspec-testsMike Greiling2018-01-251-1/+1
| | | | | | | | | | | | breaking local rspec tests
* | | Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service"Fabio Busatto2018-01-251-3/+3
| | |
* | | Use limit for search count queriessearch-100Jan Provaznik2018-01-231-0/+4
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search query is especially slow if a user searches a generic string which matches many records, in such case search can take tens of seconds or time out. To speed up the search query, we search only for first 1000 records, if there is >1000 matching records we just display "1000+" instead of precise total count supposing that with such amount the exact count is not so important for the user. Because for issues even limited search was not fast enough, 2-phase approach is used for issues: first we use simpler/faster query to get all public issues, if this exceeds the limit, we just return the limit. If the amount of matching results is lower than limit, we re-run more complex search query (which includes also confidential issues). Re-running the complex query should be fast enough in such case because the amount of matching issues is lower than limit. Because exact total_count is now limited, this patch also switches to to "prev/next" pagination. Related #40540
* | Merge branch '42206-permit-password-for-git-param' into 'master'Rémy Coutable2018-01-221-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Password authentication enabled for Git over HTTP(S) can not be disabled via UI" Closes #42206 See merge request gitlab-org/gitlab-ce!16577
| * | Permits 'password_authentication_enabled_for_git' parameter for ↵Mark Fletcher2018-01-191-0/+1
| | | | | | | | | | | | ApplicationSettingsController
* | | Merge branch '41532-email-reason' into 'master'Sean McGivern2018-01-191-0/+16
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Show why a notification email was sent Closes #41532 and #1366 See merge request gitlab-org/gitlab-ce!16160
| * | Initial work to add notification reason to emailsMario de la Ossa2018-01-161-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `#build_notification_recipients` to `NotificationRecipientService` that returns the `NotificationRecipient` objects in order to be able to access the new attribute `reason`. This new attribute is used in the different notifier methods in order to add the reason as a header: `X-GitLab-NotificationReason`. Only the reason with the most priority gets sent.
* | | WebIDE: Fix Commit bugsTim Zallmann2018-01-191-6/+8
| | |
* | | Merge branch '41247-timestamp' into 'master'Robert Speicher2018-01-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use last_edited_at instead of updated_at for displaying issuable last change Closes #41247 See merge request gitlab-org/gitlab-ce!16406
| * | | Return last edited time instead of update time41247-timestampJan Provaznik2018-01-181-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For issuable models we keep two timestamps: updated_at which is updated whenever any model attribute is changed, last_edited_at which is changed when only title or description is changed. In UI bellow description we display who and when updated the item. But last_edited_by (used for 'who') is mistakenly combined with updated_at (when), last_edited_at should be used instead. Closes #41247
* | | Merge branch 'issue_37143_2' into 'master'Sean McGivern2018-01-181-0/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Remove unnecessary query from labels dropdown Closes #37143 See merge request gitlab-org/gitlab-ce!16520
| * | Remove unnecessary query from labels filterFelipe Artur2018-01-181-0/+6
| | |
View Lorry Controller Status