summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Updated based on feedbacksearch-ui-updatePhil Hughes2016-04-261-5/+5
| | | | | | | | | | | | | | | | | | | | Changed some variable names Fixed CHANGELOG entry
* | | | Correctly shows no results textPhil Hughes2016-04-261-1/+1
| | | | | | | | | | | | | | | | Correct search results count
* | | | Humanize scope textPhil Hughes2016-04-261-1/+1
| | | |
* | | | Truncate issue descriptionPhil Hughes2016-04-261-1/+1
| | | |
* | | | Use helper methodPhil Hughes2016-04-261-8/+2
| | | |
* | | | Changes dropdown toggle on search dropdownsPhil Hughes2016-04-261-12/+14
| | | |
* | | | Removed category iconsPhil Hughes2016-04-261-66/+39
| | | |
* | | | icons on search barPhil Hughes2016-04-262-4/+9
| | | |
* | | | Mobile updates for search UIPhil Hughes2016-04-262-18/+8
| | | |
* | | | Loads group & projects on search page with ajaxPhil Hughes2016-04-262-24/+20
| | | |
* | | | Started updating search UIPhil Hughes2016-04-263-20/+15
|/ / /
* | | Merge branch 'link_user_avatar_in_activity_page_to_profile' into 'master' Robert Speicher2016-04-251-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Link user avatar in activity page to user profile Closes #14927 See merge request !3910
| * | | link user avatar in activity page to user profilelink_user_avatar_in_activity_page_to_profileArinde Eniola2016-04-251-1/+6
| |/ /
* | | Merge branch 'emoji-unicode-fix' into 'master' Jacob Schatz2016-04-251-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with emoji comments not showing correct emoji image Previously it would look for the unicode character inside the award menu. But this menu might not always be there. Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character Fixes #15512 See merge request !3885
| * | | Fixes issue with emoji comments not showing correct emoji imagePhil Hughes2016-04-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it would look for the unicode character inside the award menu. But this menu might not always be there. Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character Fixes #15512
* | | | Merge branch 'issue_14904' into 'master' Jacob Schatz2016-04-253-2/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new shortcuts Closes #14904 - On a project: `i` To navigate to New Issue page. - On a issuable: `l` To open Label dropdown on a issuable. - Global: Typing `?` multiple times now toggles the modal. See merge request !3686
| * \ \ \ Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-2132-133/+129
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-2010-20/+69
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/shared/issuable/_sidebar.html.haml
| * | | | | | Make shortcuts work when sidebar is collapsedAlfredo Sumaran2016-04-201-1/+1
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/master' into issue_14904Alfredo Sumaran2016-04-2037-72/+157
| |\ \ \ \ \ \
| * | | | | | | Use proper methodAlfredo Sumaran2016-04-181-1/+1
| | | | | | | |
| * | | | | | | Fix specsAlfredo Sumaran2016-04-181-1/+1
| | | | | | | |
| * | | | | | | Update shortcuts dialogAlfredo Sumaran2016-04-181-1/+13
| | | | | | | |
| * | | | | | | Set `i` as a shortcut for creating a new issueAlfredo Sumaran2016-04-181-0/+5
| | | | | | | |
* | | | | | | | Fix error on commit builds page when no builds yetGrzegorz Bizon2016-04-251-1/+1
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Closes #15509
* | | | | | | Use the `can?` helper instead of `current_user.can?`15513-fix-undefined-can-methodRémy Coutable2016-04-221-1/+1
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #15513. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'issue_3799' into 'master' Rémy Coutable2016-04-221-1/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow filtering by Owned projects on dashboard page Closes #3799 ![Screen_Shot_2016-04-15_at_9.40.52_PM](/uploads/440498c5647bda282304891307931a02/Screen_Shot_2016-04-15_at_9.40.52_PM.png) See merge request !3762
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into issue_3799Alfredo Sumaran2016-04-2176-276/+396
| |\ \ \ \ \ \
| * | | | | | | Do not display filters if user if there's no current_userAlfredo Sumaran2016-04-211-7/+8
| | | | | | | |
| * | | | | | | Allow filtering by Owned projectsAlfredo Sumaran2016-04-181-1/+9
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'confirmation-screen' into 'master' Robert Speicher2016-04-222-0/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved email confirmation UX Closes #4228 See merge request !3184
| * | | | | | | Improved confirmation UXconfirmation-screenPhil Hughes2016-04-212-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #4228
* | | | | | | | Merge branch 'rs-diff_view' into 'master' Rémy Coutable2016-04-221-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always read diff_view setting from the cookie Prior, when the user had their view set to "parallel" and then visited a merge request's changes tab _without_ passing the `view` parameter via query string, the view would be parallel but the `Notes` class was always instantiated with the default value from `diff_view` ("inline"), resulting in broken markup when the form to add a line note was dynamically inserted. The cookie is set whenever the view is changed, so this value should always be up-to-date. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285 See merge request !3732
| * | | | | | | Always read diff_view setting from the cookieRobert Speicher2016-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, when the user had their view set to "parallel" and then visited a merge request's changes tab _without_ passing the `view` parameter via query string, the view would be parallel but the `Notes` class was always instantiated with the default value from `diff_view` ("inline"), resulting in broken markup when the form to add a line note was dynamically inserted. The cookie is set whenever the view is changed, so this value should always be up-to-date. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557
* | | | | | | | Merge branch 'remove-update-files' into 'master' Yorick Peterse2016-04-213-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Removed JS update templates See merge request !3814
| * | | | | | | Removed JS update templatesremove-update-filesPhil Hughes2016-04-193-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceRémy Coutable2016-04-214-52/+42
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'label-dropdown-fix' into 'master' Jacob Schatz2016-04-214-52/+42
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes "create label" functionality on label dropdown **Issue sidebar** ![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif) **Issues page** ![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif) See merge request !3670
| | * | | | | | Merge remote-tracking branch 'origin/master' into label-dropdown-fixlabel-dropdown-fixAlfredo Sumaran2016-04-2010-20/+69
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Merge remote-tracking branch 'origin/master' into label-dropdown-fixAlfredo Sumaran2016-04-2061-270/+381
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/shared/issuable/_sidebar.html.haml
| | * | | | | | Move shared html to a partialAlfredo Sumaran2016-04-183-34/+21
| | | | | | | |
| | * | | | | | Add is-link attribute to know if a menu item should not be stoppedAlfredo Sumaran2016-04-181-1/+1
| | | | | | | |
| | * | | | | | Fix Label dropdown and organize codeAlfredo Sumaran2016-04-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/labels_select.js.coffee
| | * | | | | | Render proper partialAlfredo Sumaran2016-04-152-2/+2
| | | | | | | |
| | * | | | | | Add spacesAlfredo Sumaran2016-04-151-3/+3
| | | | | | | |
| | * | | | | | Reuse partial for Create Label pageAlfredo Sumaran2016-04-153-18/+21
| | | | | | | |
* | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRémy Coutable2016-04-211-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'issue_15434' into 'master' Jacob Schatz2016-04-211-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes XSS injection REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15434 **Without the fix** ![xss1](/uploads/0a7b0b15fb87066965a7c73f1dbaa815/xss1.gif) **With the fix** ![xss2](/uploads/473cfa0aa80656f24c58aebf1fd97fff/xss2.gif) See merge request !1952
| | * | | | | | | Remove unnecessary provided paramAlfredo Sumaran2016-04-211-1/+1
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge branch 'rs-issue-15408' into 'master' Robert Speicher2016-04-211-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix undefined local variable error in Invalid MR template Closes #15408 See merge request !3857