summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Change dashboard snippet index menu class to match testhanloong/gitlab-ce-add-dates-snippets-showDouwe Maan2015-10-221-1/+1
|
* Restyle dashboard snippets visibility level tabs.Douwe Maan2015-10-211-12/+8
|
* Merge branch 'master' into hanloong/gitlab-ce-add-dates-snippets-showDouwe Maan2015-10-2140-188/+279
|\
| * Merge branch 'merge-request-deleted-file' into 'master' Dmitriy Zaporozhets2015-10-202-4/+4
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Correctly find last known blob for file deleted in MR. Fixes #3092. When building a new MR, `@merge_request.commits.last` would fail because this delegates to `merge_request_diff` which is still `nil` at that point. I fixed that, and changed some of the logic because showing deleted blob contents didn't previously work for the Compare page, and the UI would show the wrong commit sha for "View File @...". See merge request !1647
| | * Correctly find last known blob for file deleted in MR.merge-request-deleted-fileDouwe Maan2015-10-202-4/+4
| | |
| * | Merge branch 'grzesiek/gitlab-ce-fix/non-member-notification-button'Robert Speicher2015-10-192-15/+21
| |\ \
| | * \ Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-buttonDouwe Maan2015-10-1924-123/+169
| | |\ \ | | | |/ | | | | | | | | [ci skip]
| | * | Sentences end in periods.Douwe Maan2015-10-181-2/+2
| | | |
| | * | Add tooltip.Douwe Maan2015-10-181-1/+1
| | | |
| | * | Find correct group membership.Douwe Maan2015-10-181-6/+5
| | | |
| | * | Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-buttonDouwe Maan2015-10-1863-191/+378
| | |\ \
| | * | | Show notifications button even if user is not member of a projectGrzegorz Bizon2015-10-121-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notifications button was unavailable if user wasn't member of the project, even if protected project is available via group privileges. Showing disabled button with explanation tool-tip is less confusing. This closes #2846.
| * | | | Merge branch 'jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify' into ↵Robert Speicher2015-10-193-0/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Send an email to admin email when a user is reported for spam Replaces !1547. Fixes #2839. See merge request !1634
| | * \ \ \ Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-1924-123/+169
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | [ci skip]
| | * | | | Add help text to admin settings notification email.Douwe Maan2015-10-181-0/+2
| | | | | |
| | * | | | Add HTML abuse report notification email.Douwe Maan2015-10-181-0/+11
| | | | | |
| | * | | | Tweak email body.Douwe Maan2015-10-181-3/+3
| | | | | |
| | * | | | Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-18109-669/+877
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Send an email (to support) when a user is reported for spamJonathan Rochkind2015-10-082-0/+9
| | | | | |
| * | | | | Merge branch 'merge-request-widget' into 'master' Dmitriy Zaporozhets2015-10-191-37/+36
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing commit status for widget when no CI service is enabled Fix for #3082 /cc @dzaporozhets See merge request !1621
| | * | | | Fix missing commit status for widget when no CI service is enabledmerge-request-widgetKamil Trzcinski2015-10-161-37/+36
| | | | | |
| * | | | | Merge branch 'notify-footer' into 'master' Robert Speicher2015-10-191-0/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore notification footer text See merge request !1640
| | * | | | | Restore notification footer text.notify-footerDouwe Maan2015-10-181-0/+4
| | | | | | |
| * | | | | | Merge branch 'user-page-new-ui' into 'master' Dmitriy Zaporozhets2015-10-194-38/+60
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement new UI for user page. Part 1 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1615
| | * | | | | | Partly implement new UI for user pageuser-page-new-uiDmitriy Zaporozhets2015-10-164-38/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into ↵Douwe Maan2015-10-192-1/+19
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add ability to remove the fork relationship from project settings ![Screen_Shot_2015-10-18_at_12.37.24](/uploads/676571642a4c90f7f286280d714599a3/Screen_Shot_2015-10-18_at_12.37.24.png) ![Screen_Shot_2015-10-18_at_12.37.28](/uploads/1a069ecfc4cd3b5438772a9c3f04b6fc/Screen_Shot_2015-10-18_at_12.37.28.png) Replaces !1579. Fixes #2578. See merge request !1636
| | * | | | | | | Tweak wording.Douwe Maan2015-10-181-15/+15
| | | | | | | | |
| | * | | | | | | Merge branch 'master' into remove-forks-from-projects-settingsHan Loong Liauw2015-10-1745-170/+339
| | |\ \ \ \ \ \ \
| | * | | | | | | | Made suggested content changes based on MR ReviewHan Loong Liauw2015-10-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the authentication method for removing fork through API Reflected changes to new auth method in API specs
| | * | | | | | | | Adds ability to remove the forked relationshipHan Loong Liauw2015-10-132-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was previously possible through the API but can now be done through the project#edit settings screen if the current user is the owner of the project. Update changelog
| * | | | | | | | | Merge branch 'cristianbica/gitlab-ce-user-project-view-files' into 'master' Dmitriy Zaporozhets2015-10-1914-82/+80
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to select the Files view as default project view ![Screen_Shot_2015-10-17_at_19.24.01](/uploads/c3194db856f5e5e1b3493302c0a479a5/Screen_Shot_2015-10-17_at_19.24.01.png) Also shows the readme at the very bottom, like on the regular Files page. Replaces !1489. Closes #2655. See merge request !1632
| | * | | | | | | | | Tweak help text.Douwe Maan2015-10-171-2/+2
| | | | | | | | | | |
| | * | | | | | | | | Put grey block around blob ref switcher and breadcrumb.Douwe Maan2015-10-172-17/+17
| | | | | | | | | | |
| | * | | | | | | | | Tweak styling of project home files list.Douwe Maan2015-10-171-9/+4
| | | | | | | | | | |
| | * | | | | | | | | Use same style for project readme, tree readme and regular blob.Douwe Maan2015-10-172-11/+10
| | | | | | | | | | |
| | * | | | | | | | | Split up projects/tree/_tree partial.Douwe Maan2015-10-173-38/+37
| | | | | | | | | | |
| | * | | | | | | | | Remove redundant helper method.Douwe Maan2015-10-171-4/+3
| | | | | | | | | | |
| | * | | | | | | | | Move last push info at top of project page.Douwe Maan2015-10-173-3/+3
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'master' into cristianbica/gitlab-ce-user-project-view-filesDouwe Maan2015-10-17123-748/+963
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | * | | | | | | | | Allow users to select the Files view as default project viewCristian Bica2015-10-014-9/+15
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #9744 from jamierocks/patch-1Stan Hu2015-10-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | Fix spelling of Description
| | * | | | | | | | | Fix spelling of DescriptionJamie Mansfield2015-10-181-1/+1
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'cross-reference-mr-on-issues' into 'master' Douwe Maan2015-10-182-1/+5
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show merge requests which close current issue Closes #2903 ### What does this MR do If an issue is to be closed by a merge request the current user has access to, this will be displayed when the user looks at the issue. ![Screenshot_from_2015-10-12_12-10-37](https://gitlab.com/zj/gitlab-ce/uploads/52e429704e73067b24b69801f13ad7bc/Screenshot_from_2015-10-12_12-10-37.png) /cc @DouweM See merge request !1569
| | * | | | | | | | Only accept open issues and merge requestsZeger-Jan van de Weg2015-10-162-7/+4
| | | | | | | | | |
| | * | | | | | | | Show merge requests which close current issueZeger-Jan van de Weg2015-10-162-1/+8
| | | | | | | | | |
| * | | | | | | | | Merge branch 'rs-redactor-filter' into 'master' Douwe Maan2015-10-177-9/+7
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate rendering of Markdown reference links from redacting those the user doesn't have access to and extracting referenced objects Related: !1014 See merge request !1090
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into rs-redactor-filterrs-redactor-filterDouwe Maan2015-10-1625-32/+150
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | * | | | | | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-1558-330/+405
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-07280-960/+3299
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Remove last remaining `reference_only_path` usagesRobert Speicher2015-09-033-3/+3
| | | | | | | | | | | | |
View Lorry Controller Status