summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge branch 'master' into ui/dashboard-new-issueDouwe Maan2015-12-0710-67/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-dategsmethells/gitlab-ce-sort-by-due-dateDouwe Maan2015-12-079-66/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'link-refs' into 'master' Robert Speicher2015-12-042-2/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recognize issue/MR/snippet/commit links as references. Fixes #3744 and #3745 See merge request !1933
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into link-refsDouwe Maan2015-12-033-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | | Show local issues and MRs in "This X closes... / closed by..." sentenceDouwe Maan2015-11-302-2/+10
| | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Ensure "Remove Source Branch" button is not shown when branch is being ↵Rubén Dávila2015-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleted. #3583
| | * | | | | | | | | | | | | Merge remote-tracking branch 'origin/ui/issuable-form'Dmitriy Zaporozhets2015-12-042-6/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ui/issuable-formDouwe Maan2015-12-033-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | | Fix branch renderingDouwe Maan2015-12-021-2/+4
| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Don't reset target branch when choosing to "Change branches" in MRDouwe Maan2015-12-021-2/+3
| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Add "No Milestone" option to issue milestone selectDouwe Maan2015-12-021-2/+4
| | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'ui/sidebar' into 'master' Dmitriy Zaporozhets2015-12-041-0/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Sidebar & header tweaks and fixes Depends on !1953 See the commits for more details, the messages mostly speak for themselves. ![Logo](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ba088150165bb0a0aea1e894f3443f43/logo_tooltip.png) ![Sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1e8c09ac3bf489cdb9531eebea18c90/sidebar_tooltips.png) Fixes #2928, #2071, https://dev.gitlab.org/gitlab/gitlabhq/issues/2575, and https://dev.gitlab.org/gitlab/gitlabhq/issues/2573 See merge request !1958
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ui/sidebarui/sidebarDouwe Maan2015-12-033-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/stylesheets/framework/sidebar.scss
| | | * | | | | | | | | | | | | Restore sidebar tooltips and fix logo tooltip locationDouwe Maan2015-12-021-0/+8
| | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'ui/new-project' into 'master' Dmitriy Zaporozhets2015-12-031-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: New Project form tweaks Depends on !1953 See the commits for more details, the messages mostly speak for themselves. Before: ![Screen_Shot_2015-12-02_at_17.43.23](/uploads/302e734f6796a85a9f4be9c2f494869d/Screen_Shot_2015-12-02_at_17.43.23.png) After: ![Screen_Shot_2015-12-02_at_17.44.11](/uploads/411980e53a4f87cf0a04e5bcb7329f82/Screen_Shot_2015-12-02_at_17.44.11.png) See merge request !1964
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ui/new-projectui/new-projectDouwe Maan2015-12-033-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | | Unify new project namespace select and path inputDouwe Maan2015-12-021-3/+3
| | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'ui/issuable-filter' into 'master' Dmitriy Zaporozhets2015-12-032-9/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Issuable filter tweaks Depends on !1953 See the commits for more details, the messages mostly speak for themselves. # Highlights ## Filter bar Before: ![filter_before](/uploads/b061be7521c6d5babb77c7d12e77f65e/filter_before.png) After: ![filter_after](/uploads/aadfbcd77caf1b49fde8ca6d781f1004/filter_after.png) ## Bulk edit bar Before: ![bulk_before](/uploads/849c98224e1f335c65c0de5616bbcdae/bulk_before.png) After: ![bulk_after](/uploads/185d29116663f9f663acab76d328096f/bulk_after.png) See merge request !1963
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ui/issuable-filterDouwe Maan2015-12-033-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | | Remove "none" username for "Unassigned" and "Any User" select optionsDouwe Maan2015-12-022-9/+12
| | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'ui/issuable-list-item' into 'master' Dmitriy Zaporozhets2015-12-031-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Issuable list item tweaks Depends on !1953 See the commits for more details, the messages mostly speak for themselves. Before: ![Screen_Shot_2015-12-02_at_17.37.40](/uploads/00ac22d131c49ce548bccd96866cbc75/Screen_Shot_2015-12-02_at_17.37.40.png) After: ![merge_item_after](/uploads/201d742494596c50bbdb3626f06f65a8/merge_item_after.png) Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2590 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2589 See merge request !1962
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ui/issuable-list-itemui/issuable-list-itemDouwe Maan2015-12-033-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | | Use "Assigned to USER" tooltip in issue list itemDouwe Maan2015-12-021-2/+3
| | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'ui/project-home-panel' into 'master' Dmitriy Zaporozhets2015-12-032-43/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UI: Project home panel tweaks Depends on !1953 See the commits for more details, the messages mostly speak for themselves. Before: ![Screen_Shot_2015-12-02_at_17.46.01](/uploads/f07a4f2370c6863a68df46f655b513c4/Screen_Shot_2015-12-02_at_17.46.01.png) After: ![Screen_Shot_2015-12-02_at_17.45.40](/uploads/da9b19d3bd89b9421457e0df550efd6e/Screen_Shot_2015-12-02_at_17.45.40.png) See merge request !1965
| | | * | | | | | | | | | | | Merge branch 'master' into ui/project-home-panelui/project-home-panelDouwe Maan2015-12-033-5/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | | Add visibility description tooltip to snippet and project visibility labelsDouwe Maan2015-12-022-43/+23
| | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| * | | | | | | | | | | | | sort milestones by due_dateGreg Smethells2015-12-031-0/+2
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'master' into ui/emojiui/emojiDouwe Maan2015-12-033-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Use full names in emoji tooltipDouwe Maan2015-12-021-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Use select2 dropdown for dashboard/group 'New X' buttonsDouwe Maan2015-12-071-0/+13
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Brefer "Directory" over "Dir", "Files" over "Codeui/consistencyDouwe Maan2015-12-021-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Truncate submodule commit SHAs to 7 charactersDouwe Maan2015-12-021-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Capitalize tab titlesDouwe Maan2015-12-021-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'gmail_actions_links_on_set_of_emails' into 'master' Dmitriy Zaporozhets2015-11-301-0/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show Gmail actions links only on expected set of emails See merge request !1901
| * | | | | | | | | | If action link is not found, return nil.Marin Jankovski2015-11-251-0/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'rs-clone-panel' into 'master' Dmitriy Zaporozhets2015-11-303-10/+59
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add clipboard button for project clone panel Closes #3585 Project: ![Screen_Shot_2015-11-24_at_7.34.04_PM](/uploads/8bf73a2816f2525896023c36aea402bc/Screen_Shot_2015-11-24_at_7.34.04_PM.png) Wiki: ![Screen_Shot_2015-11-24_at_7.34.43_PM](/uploads/ddf400a1c979a1d8b535a34877cd6163/Screen_Shot_2015-11-24_at_7.34.43_PM.png) See merge request !1896
| * | | | | | | | | | | Add clipboard button to project clone panelRobert Speicher2015-11-242-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #3585
| * | | | | | | | | | | Rework the copy_to_clipboard logicRobert Speicher2015-11-241-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It needed to be more flexible in how we set the target text or element.
| * | | | | | | | | | | Move clipboard_button helper to ButtonHelper moduleRobert Speicher2015-11-242-8/+7
| | | | | | | | | | | |
| * | | | | | | | | | | Move HTTP/SSH clone button logic to helpersRobert Speicher2015-11-241-0/+35
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #9670 from janten/gravatar-retinaStan Hu2015-11-261-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Add support for HiDPI displays in gravatar service
| * | | | | | | | | | Fix typoJan-Gerd Tenberge2015-11-011-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix merge errorJan-Gerd Tenberge2015-10-231-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix merge errorJan-Gerd Tenberge2015-10-2227-211/+223
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add scale argument in user classJan-Gerd Tenberge2015-09-261-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Add scale parameter to helperJan-Gerd Tenberge2015-09-261-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Fix for Emojinotes_fix_stablenotes_fixValery Sizov2015-11-201-0/+2
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'emoji_votes' into 'master' Dmitriy Zaporozhets2015-11-191-0/+25
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Award Emoji This it first iteration of award emoji feature. We have plan to extend emoji picker by the next release. For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker. See merge request !1825
| * | | | | | | | | | | added spinach testsValery Sizov2015-11-191-1/+5
| | | | | | | | | | | |
| * | | | | | | | | | | addressing commentsValery Sizov2015-11-191-0/+4
| | | | | | | | | | | |