summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Resolve "Decouple multi-file editor from file list"Tim Zallmann2017-12-212-4/+41
|
* Merge branch '36958-enable-ordering-projects-subgroups-by-name' into 'master'Rémy Coutable2017-12-211-2/+8
|\ | | | | | | | | | | | | Enables ordering groups and their children by name in the web interface Closes #24962 et #36958 See merge request gitlab-org/gitlab-ce!16045
| * Enable sorting by name in the Groups dropdownMark Fletcher2017-12-201-0/+2
| |
| * Employ Groups dropdown in admin viewMark Fletcher2017-12-201-2/+6
| |
* | Use UserSerializer instead of `User.to_json`Robert Speicher2017-12-193-3/+3
|/
* Merge branch 'fix-cluster-enviroment-missing' into 'master'Kamil Trzciński2017-12-191-0/+5
|\ | | | | | | | | Fix cluster enviroment missing See merge request gitlab-org/gitlab-ce!15973
| * Hardcode clusters helper in CEMatija Čupić2017-12-181-1/+1
| |
| * Use helper for feature check in cluster partialsMatija Čupić2017-12-181-0/+5
| |
* | Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'Kamil Trzciński2017-12-181-0/+5
|\ \ | | | | | | | | | | | | | | | | | | Add button to run scheduled pipeline immediately Closes #38741 See merge request gitlab-org/gitlab-ce!15700
| * | Address some comments with running a pipeline scheduleStan Hu2017-12-121-2/+2
| | |
| * | Add button to run scheduled pipeline immediatelyStan Hu2017-12-121-0/+5
| | | | | | | | | | | | Closes #38741
* | | Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'Sean McGivern2017-12-181-2/+2
|\ \ \ | |_|/ |/| | | | | | | | Stop sending milestone and labels for Projects::MergeRequestsController#show.json requests See merge request gitlab-org/gitlab-ce!15847
| * | Stop sending milestone and labels data over the wire for MR widgetosw-isolate-mr-widget-exposed-attributesOswaldo Ferreira2017-12-151-2/+2
| | | | | | | | | | | | requests
* | | Update issuable status icons33926-update-issuable-iconsEric Eastwood2017-12-131-1/+1
| |/ |/| | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33926 Changed file icons already addressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15367
* | Merge branch ↵Robert Speicher2017-12-121-7/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenter' into 'master' Refactor member view by using presenter Closes #28004 See merge request gitlab-org/gitlab-ce!15715
| * | Refactor member view by using presenterTM Lee2017-12-111-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create MemberPresenter alongside with GroupMemberPresenter and ProjectMemberPresenter - Make Member model Presentable - Move action_member_permission from MembersHelper into the MemberPresenter - Added rspec using double, separate specs for GroupMemberPresenter and ProjectMemberPresenter Fixes #28004. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'sophie-h/gitlab-ce-patch-15' into 'master'pawel/update-prometheus_gem_to_highly_optimized_versionSean McGivern2017-12-121-0/+7
|\ \ \ | | | | | | | | | | | | | | | | Hide issues and MRs in labels list if disabled See merge request gitlab-org/gitlab-ce!15863
| * | | Hide issues and MRs in labels list if disabledsophie-h/gitlab-ce-patch-15Sophie Herold2017-12-111-0/+7
| |/ / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'dm-image-blob-diff-full-url' into 'master'Sean McGivern2017-12-122-9/+21
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Use app host instead of asset host when rendering image blob or diff Closes #41002 See merge request gitlab-org/gitlab-ce!15854
| * | Use app host instead of asset host when rendering image blob or diffdm-image-blob-diff-full-urlDouwe Maan2017-12-122-9/+21
| | |
* | | Merge branch '36679-non-authorized-user-may-see-wikis-or-pipeline-page' into ↵Douwe Maan2017-12-081-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | 'security-10-2' Fixes project visibility guidelines See merge request gitlab/gitlabhq!2226 (cherry picked from commit 877c42c0aaf3298d6001614c9706bc366ae4014c) e4fd1c26 Ensure project wiki visibility guidelines are met
* | Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-082-18/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving the check out of the general requests, makes sure we don't have any slowdown in the regular requests. To keep the process performing this checks small, the check is still performed inside a unicorn. But that is called from a process running on the same server. Because the checks are now done outside normal request, we can have a simpler failure strategy: The check is now performed in the background every `circuitbreaker_check_interval`. Failures are logged in redis. The failures are reset when the check succeeds. Per check we will try `circuitbreaker_access_retries` times within `circuitbreaker_storage_timeout` seconds. When the number of failures exceeds `circuitbreaker_failure_count_threshold`, we will block access to the storage. After `failure_reset_time` of no checks, we will clear the stored failures. This could happen when the process that performs the checks is not running.
* | Merge branch '40825-use-relative-path-urls' into 'master'Robert Speicher2017-12-071-2/+1
|\ \ | |/ |/| | | | | | | | | Use relative _path helper URLs in the GitLab UI Closes #40825 See merge request gitlab-org/gitlab-ce!15738
| * Use relative _path helper URLs in the GitLab UI40825-use-relative-path-urlsEric Eastwood2017-12-071-2/+1
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40825
* | Merge branch ↵Kamil Trzciński2017-12-071-16/+0
|\ \ | |/ |/| | | | | | | | | | | | | '40761-remove-the-checkbox-for-starting-a-new-pipeline-in-auto-devops-settings' into 'master' Resolve "Remove the checkbox for starting a new pipeline in Auto DevOps settings" Closes #40761 See merge request gitlab-org/gitlab-ce!15714
| * Remove Auto DevOps checkboxes - backendbikebilly2017-12-041-16/+0
| |
* | adding view and feature specsmicael.bergeron2017-12-071-16/+16
| |
* | corrects the url buildingmicael.bergeron2017-12-071-2/+2
| |
* | diff notes created in merge request on a commit have the right contextmicael.bergeron2017-12-071-0/+24
| | | | | | | | add a spec for commit merge request diff notes
* | Allow commenting on individual commits inside an MRDouwe Maan2017-12-071-0/+8
| |
* | Merge branch 'ce-backport-3615' into 'master'Sean McGivern2017-12-071-0/+2
|\ \ | | | | | | | | | | | | Refactor banzai to support referencing from group context See merge request gitlab-org/gitlab-ce!15766
| * | Refactor banzai to support referencing from group contextce-backport-3615Jarka Kadlecova2017-12-061-0/+2
| |/
* | Merge branch 'patch-24' into 'master'Sean McGivern2017-12-061-1/+1
|\ \ | | | | | | | | | | | | Fix graph notes number duplication. See merge request gitlab-org/gitlab-ce!15696
| * | Fix graph notes number duplication.Vladislav Kaverin2017-12-031-1/+1
| | | | | | | | | | | | Function `pluralize` already returns the number along with pluralized word.
* | | Merge branch ↵Sean McGivern2017-12-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '39364-in-issue-board-url-doesn-t-take-in-account-hostname-settings' into 'master' Resolve "In Issue board url doesn't take in account hostname settings" Closes #39364 See merge request gitlab-org/gitlab-ce!15703
| * | | Use path helper instead of url helperLuke Bennett2017-12-031-1/+1
| |/ /
* | | Fixed clone buttons adding description when append_link is falseJose Ivan Vargas2017-12-051-1/+1
| | |
* | | Merge branch 'feature/custom-text-for-new-projects' into 'master'Rémy Coutable2017-12-051-12/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add custom brand text on new project pages Closes #15265 See merge request gitlab-org/gitlab-ce!15541
| * | | Add custom brand text on new project pagesMarkus Koller2017-12-041-12/+8
| | |/ | |/|
* | | show status of issue links in wiki pagehaseeb2017-12-041-1/+7
|/ /
* | Add underline hover state to all linksAnnabel Dunstone Gray2017-12-041-2/+2
|/
* Merge branch '38668-revert-copied-kubernetesservice-logic' into 'master'Grzegorz Bizon2017-11-301-1/+1
|\ | | | | | | | | Copy `KubernetesService` logic in `Clusters::Platforms::Kubernetes` to make it interchangeable. And implement a selector. See merge request gitlab-org/gitlab-ce!15515
| * Replce kubernetes_service and deployment_service to deployment_platformShinya Maeda2017-11-281-1/+1
| |
* | Merge branch '39455-clone-dropdown-should-not-have-a-tooltip' into 'master'Tim Zallmann2017-11-302-33/+27
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Clone dropdown should not have a tooltip" Closes #39455 See merge request gitlab-org/gitlab-ce!15334
| * | Added ssh_button helper specs and addressed ruby code observationsJose Ivan Vargas2017-11-271-22/+22
| | |
| * | UX adjustments and spec correctionsJose Ivan Vargas2017-11-272-4/+4
| | |
| * | Removed tooltip from clone dropdownJose Ivan Vargas2017-11-271-26/+20
| |/
* | Backport epic tasklistClement Ho2017-11-291-0/+1
| |
* | Add timeouts for Gitaly callsAndrew Newdigate2017-11-291-0/+3
| |
* | BE for automatic pipeline when enabling Auto DevOpsMatija Čupić2017-11-281-0/+16
|/ | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38962
View Lorry Controller Status