summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Remove helpers assigned_issuables_count and cached_assigned_issuables_countuassign_on_member_removingValery Sizov2017-04-201-10/+2
|
* Remove assigned_(issues|merge_requests) methods from the issuableValery Sizov2017-04-181-1/+1
|
* Using IssuablesFinder(s) for UI countersValery Sizov2017-04-181-1/+2
|
* Merge branch 'use-avatars-in-activity-view' into 'master' Douwe Maan2017-04-121-0/+28
|\ | | | | | | | | Use avatars instead of icons in activity view See merge request !10596
| * Move event icons into events_helperuse-avatars-in-activity-viewAnnabel Dunstone Gray2017-04-122-20/+30
| |
| * Add helper for using avatars vs iconsAnnabel Dunstone Gray2017-04-111-1/+14
| |
| * Reuse system notes helper for profile event iconsAnnabel Dunstone Gray2017-04-111-2/+7
| |
* | Improve webpack-dev-server compatibility with non-localhost setups.Mike Greiling2017-04-122-2/+33
| |
* | Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-112-4/+17
|\ \ | | | | | | | | | | | | | | | | | | Link to outdated diff in older MR version from outdated diff discussion Closes #27865 See merge request !10572
| * | Fix specsDouwe Maan2017-04-091-0/+2
| | |
| * | Some code tweaksDouwe Maan2017-04-081-1/+1
| | |
| * | Fix views after rebaseDouwe Maan2017-04-081-2/+4
| | |
| * | Fix specs and make tweaksDouwe Maan2017-04-081-0/+2
| | |
| * | Add link to diff header tooDouwe Maan2017-04-081-3/+10
| | |
* | | Merge branch 'dz-fix-project-view' into 'master' Annabel Dunstone Gray2017-04-111-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change project view default for existing users and anonymous visitors to files+readme Closes #29926 See merge request !10498
| * | | Change project view default for existing users and anonymous visitors to ↵dz-fix-project-viewDmitriy Zaporozhets2017-04-101-1/+5
| | |/ | |/| | | | | | | | | | | | | files+readme Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Don't show 'Copy content' button on text files that are not rendered as textDouwe Maan2017-04-101-0/+4
|/ /
* | Remove the User#is_admin? methodblackst0ne2017-04-091-1/+1
|/
* Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-071-1/+1
|\
| * Update MR title change iconAnnabel Dunstone Gray2017-04-071-1/+1
| |
* | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-072-1/+9
|\ \ | |/
| * Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-072-1/+9
| |\ | | | | | | | | | | | | | | | | | | Protected Tags Closes #18471 See merge request !10356
| | * Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-064-36/+48
| | |\ | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/import_export/all_models.yml
| | * \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-061-2/+18
| | |\ \
| | * | | Protected Tags backend review changesJames Edwards-Jones2017-04-061-0/+4
| | | | | | | | | | | | | | | Added changelog
| | * | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0611-17/+87
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss
| | * | | | Moved Project#protected_branch? to ProtectedBranch, similar for tagsJames Edwards-Jones2017-04-032-2/+2
| | | | | |
| | * | | | Added ‘protected’ label and disabled delete button for tags index/showJames Edwards-Jones2017-03-311-0/+4
| | | | | |
* | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-073-6/+51
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '24784-mr-system-notes' into 'master' Annabel Dunstone Gray2017-04-071-0/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | View helpful system note in comment threads Closes #24784 See merge request !10503
| | * | | | | Fix icon name error24784-mr-system-notesAnnabel Dunstone Gray2017-04-061-1/+1
| | | | | | |
| | * | | | | Rewrite system note helperAnnabel Dunstone Gray2017-04-061-39/+21
| | | | | | |
| | * | | | | Change edit iconAnnabel Dunstone Gray2017-04-061-1/+1
| | | | | | |
| | * | | | | Leave icon area blank if legacy note; remove diamond iconAnnabel Dunstone Gray2017-04-061-3/+1
| | | | | | |
| | * | | | | Fix positioning of note iconsAnnabel Dunstone Gray2017-04-061-1/+1
| | | | | | |
| | * | | | | Fix newline errorsAnnabel Dunstone Gray2017-04-061-0/+2
| | | | | | |
| | * | | | | Add remaining system note iconsAnnabel Dunstone Gray2017-04-061-3/+19
| | | | | | |
| | * | | | | Add system notes icon helper; add iconsAnnabel Dunstone Gray2017-04-061-0/+28
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'button-capitalization' into 'master' Clement Ho2017-04-061-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Button capitalisation Closes #18931 See merge request !10418
| | * | | | Fixed button capitalisation for Projects in viewsJose Ivan Vargas Lopez2017-04-061-1/+1
| | | | | |
| * | | | | Copy diff file path as GFMDouwe Maan2017-04-062-5/+24
| |/ / / /
* | | | | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-063-31/+24
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml
| * | | | Linking to edit file directlyEric Eastwood2017-04-061-17/+22
| | | | |
| * | | | Merge branch '27262-issue-recent-searches' into 'master' Jacob Schatz2017-04-061-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent search history for issues Closes #27262 See merge request !10324
| | * | | | Recent search history for issuesEric Eastwood2017-04-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/27262
| * | | | | Merge branch 'feature/enforce-2fa-per-group' into 'master' Douwe Maan2017-04-061-12/+0
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Support 2FA requirement per-group See merge request !8763
| | * | | | Move AuthHelper#two_factor_skippable? into ApplicationControllerMarkus Koller2017-04-061-12/+0
| | | |_|/ | | |/| |
* | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-062-3/+22
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '28810-projectfinder-should-handle-more-options' into 'master' Rémy Coutable2017-04-061-2/+18
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | ProjectsFinder should handle more options Closes #28810 See merge request !9682
| | * | | ProjectsFinder should handle more optionsJacopo2017-04-061-2/+18
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extended ProjectFinder in order to handle the following options: - current_user - which user use - project_ids_relation: int[] - project ids to use - params: - trending: boolean - non_public: boolean - starred: boolean - sort: string - visibility_level: int - tags: string[] - personal: boolean - search: string - non_archived: boolean GroupProjectsFinder now inherits from ProjectsFinder. Changed the code in order to use the new available options.