summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | 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
| | | | | | | | | | | |
| * | | | | | | | | | | Basic support for an Atom-specific rendering pipelineRobert Speicher2015-09-034-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Return early from markdown and gfm when text is emptyRobert Speicher2015-09-032-4/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Temporary bring /ci page page with help informationDmitriy Zaporozhets2015-10-171-0/+20
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | Merge branch 'filter-label' into 'master' Robert Speicher2015-10-161-5/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow dashboard and group issues/MRs to be filtered by label See merge request !1591
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into filter-labelfilter-labelDouwe Maan2015-10-1430-172/+178
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow dashboard and group issues/MRs to be filtered by labelDouwe Maan2015-10-141-5/+4
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Fix import from SVN linkDrew Blessing2015-10-161-1/+1
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'last-commit-project-page' into 'master' Dmitriy Zaporozhets2015-10-162-0/+16
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show last commit from default branch on project home page Implements #2705 Screenshot: ![Screenshot_2015-10-15_19.03.29](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef1cfa6764ab0ec5e7584ae61980a47d/Screenshot_2015-10-15_19.03.29.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler See merge request !1610
| * | | | | | | | | | Change order of sha and commit message on project home pageDmitriy Zaporozhets2015-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | Show last commit from default branch on project home pageDmitriy Zaporozhets2015-10-152-0/+16
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | Merge branch 'sentences-end-in-periods' into 'master' Robert Speicher2015-10-151-1/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sentences end in periods. [ci skip] See merge request !1604
| * | | | | | | | | | Sentences end in periods.sentences-end-in-periodsDouwe Maan2015-10-151-1/+2
| | | | | | | | | | |
* | | | | | | | | | | Added missing comma [ci skip]Kamil Trzcinski2015-10-151-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Make the builds view and warning notice nicerKamil Trzcinski2015-10-152-5/+6
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Fix builds view count indicatorKamil Trzcinski2015-10-151-3/+3
| | | | | | | | | |
* | | | | | | | | | Merge branch 'view-issue-performance'Dmitriy Zaporozhets2015-10-1519-25/+25
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Don't use link_to/image_tag where not neededYorick Peterse2015-10-153-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In these particular instances we can just use HAML tags directly. This can shave off some time spent loading issue pages, though this depends on the amount of comments being displayed. When viewing https://gitlab.com/gitlab-org/gitlab-ce/issues/2164 locally these changes reduce loading time by about 400 ms in total.
| * | | | | | | | | Use note.author for issue comment avatarsYorick Peterse2015-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for running a query to find the User object again based on the supplied Email address.
| * | | | | | | | | Re-use User objects for avatar_icon where possibleYorick Peterse2015-10-1516-17/+17
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for running an extra SQL query in these cases.
* | | | | | | | | Merge branch 'builds-view' into 'master' Kamil Trzciński2015-10-154-1/+117
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added builds view ![Screen_Shot_2015-10-13_at_19.02.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/95bb3a7d9d603678fdd077558637045d/Screen_Shot_2015-10-13_at_19.02.48.png) /cc @dzaporozhets @vsizov See merge request !1593
| * | | | | | | | Remove unneeded changebuilds-viewKamil Trzcinski2015-10-152-3/+3
| | | | | | | | |
| * | | | | | | | Fix cancel_all specsKamil Trzcinski2015-10-141-1/+1
| | | | | | | | |
| * | | | | | | | Refactor builds viewKamil Trzcinski2015-10-143-26/+26
| | | | | | | | |
| * | | | | | | | Added builds viewKamil Trzcinski2015-10-145-2/+118
| | | | | | | | |
* | | | | | | | | Fix warning signshow_pending_warningKamil Trzcinski2015-10-142-5/+4
| | | | | | | | |
* | | | | | | | | Show warning if build doesn't have runners with specified tags or runners ↵Kamil Trzcinski2015-10-142-0/+25
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | didn't connect recently Slightly refactor runner status detection: moving it to Runner class Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
* | | | | | | | Merge branch 'fix-retry-and-cancel' into 'master' Kamil Trzciński2015-10-142-12/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix retry and cancel for build This fixes some regressions introduced by Commit Status API See merge request !1586
| * | | | | | | | Fix retry and cancel for buildfix-retry-and-cancelKamil Trzcinski2015-10-142-12/+16
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix_issue_2906' into 'master' Douwe Maan2015-10-142-2/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + and Titleize New Project button on dashboard Hello there. Its my first merge request in open source world. So please be tolerant to me if i do something wrong. I try to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/2906 See merge request !1564
| * | | | | | | Use css styleЧингиз Ауанасов2015-10-132-2/+4
| | | | | | | |
| * | | | | | | + and Titleize New Project button on dashboardЧингиз Ауанасов2015-10-102-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'stanhu/gitlab-ce-wiki-add-new-page-in-pages-tab'Dmitriy Zaporozhets2015-10-131-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add "New Page" button to Wiki Pages tabStan Hu2015-10-121-0/+1
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Closes #2998
* | | | | | | | Merge branch 'redesign-files-page'Dmitriy Zaporozhets2015-10-134-61/+64
|\ \ \ \ \ \ \ \
| * | | | | | | | Apply new design to files pageDmitriy Zaporozhets2015-10-134-61/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch 'group_names_widget' into 'master' Dmitriy Zaporozhets2015-10-133-3/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project names are not fully shown if group name is too big, even on group page view https://dev.gitlab.org/gitlab/gitlabhq/issues/2548 ![joxi_screenshot_1444408109183](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c21ae245254b82db0212298b6f997067/joxi_screenshot_1444408109183.png) See merge request !1561
| * | | | | | | | | Project names are not fully shown if group name is too big, even on group ↵group_names_widgetValery Sizov2015-10-133-3/+5
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | page view
* | | | | | | | | Merge branch 'commit_status' into 'master' Kamil Trzciński2015-10-134-76/+78
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Commit Status API This is preliminary implementation of Commit Status API, pretty much compatible with GitHub. 1. The Commit Statuses are stored in separate table: ci_commit_status. 2. The POST inserts a new row. 3. To POST execute GitLab API `post :id/repository/commits/:sha/status`. This accepts dual authorization: - Using authorized user - Using ci-token to allow easy posting from CI Services 4. This adds predefined variable to GitLab CI build environment: CI_BUILD_STATUS_URL, allowing to easy post status from within build (ex. with code coverage or other metrics). 5. This adds statuses to commit's builds view. 6. The commit's status is calculated taking into account status of all builds and all posted statuses. 7. The commit statuses doesn't trigger notifications. 8. The commit status API introduces two new privileges: `read_commit_statuses` and `create_commit_status`. 9. We still miss a few tests and documentation updates for API and CI. @dzaporozhets @sytses What do you think? See merge request !1530
| * | | | | | | | Fix feature testsKamil Trzcinski2015-10-121-1/+1
| | | | | | | | |
| * | | | | | | | Rename builds_without_retry to latest_buildsKamil Trzcinski2015-10-121-2/+2
| | | | | | | | |
| * | | | | | | | Update renderingKamil Trzcinski2015-10-123-50/+28
| | | | | | | | |
| * | | | | | | | Small bug fixesKamil Trzcinski2015-10-121-8/+8
| | | | | | | | |