summaryrefslogtreecommitdiff
path: root/app/views/projects
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'image-diff' into 'master' Douwe Maan2016-02-173-11/+18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for showing images - Render scrubbed SVG's inline, not via /raw/ - Use /raw/ requests on image diffs Both of these are needed because of no longer eager loading blobs. This a follow-up to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2830 Also see https://gitlab.com/gitlab-org/gitlab-ce/issues/13350 See merge request !2837
| * Fixes requested by Rémyimage-diffJacob Vosmaer2016-02-172-4/+5
| |
| * No use to sanitize partial blob dataJacob Vosmaer2016-02-171-1/+1
| |
| * Use /raw/ requests for image diffsJacob Vosmaer2016-02-161-9/+9
| |
| * Fix SVG blob renderingJacob Vosmaer2016-02-161-1/+7
| |
* | Merge branch 'fix/13517-impossible-subsequent-issuable-edits-in-sidebar' ↵Douwe Maan2016-02-172-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix a bug preventing from doing subsequent edits in any Issuable sidebar Fixes #13517. Fixes #12572. ### Issue ![impossible-subsequent-issue-edits-in-sidebar](/uploads/bd45c0effb46848641932d9cd38d3fe2/impossible-subsequent-issue-edits-in-sidebar.gif) --- ### Merge request ![impossible-subsequent-mr-edits-in-sidebar](/uploads/b4e1e3e93df4ac0a3d962df8b6139de9/impossible-subsequent-mr-edits-in-sidebar.gif) /cc @jschatz1 @sytses See merge request !2848
| * | Fix a bug preventing from doing subsequent edits in any Issuable sidebarfix/13517-impossible-subsequent-issuable-edits-in-sidebarRémy Coutable2016-02-172-4/+4
| |/
* | Merge branch 'issue_13359' into 'master' Jacob Schatz2016-02-171-10/+13
|\ \ | |/ |/| | | | | | | | | | | | | Prevents floated button group on issues view Issue #13359 ![screenshot](/uploads/962ac4f3f1f3d6ef87f7152c09090801/screenshot.jpg) See merge request !2826
| * Wrap issue details to prevent content misalignmentissue_13359Alfredo Sumaran2016-02-161-9/+12
| |
| * Change "opened by" to just "by"Alfredo Sumaran2016-02-161-1/+1
| |
| * Move issue details after action buttonsAlfredo Sumaran2016-02-151-10/+10
| |
* | Eager-load image blob data in diffsfix/13458-eager-load-blob-dataRémy Coutable2016-02-161-0/+2
|/ | | | | | | Since gitlab_git 8.0, blob data are lazy-loaded so we have to call blob.load_all_data!(repo) to eager-load them. Fixes #13458.
* Merge branch 'rs-issue-merge-requests' into 'master' Douwe Maan2016-02-121-3/+3
|\ | | | | | | | | | | | | Correct indentation for `issues/merge_requests` partial render Prior, it would only be shown if the issue had been edited. See merge request !2789
| * Correct indentation for `issues/merge_requests` partial renderrs-issue-merge-requestsRobert Speicher2016-02-111-3/+3
| | | | | | | | Prior, it would only be shown if the issue had been edited.
* | Don't show fork button if user can't fork the project.issue_13369Rubén Dávila2016-02-111-8/+9
| |
* | Change MR link to "View Open Merge Request"display-mr-link-if-thre-is-oneDouglas Barbosa Alexandre2016-02-102-2/+2
| |
* | Replaces "Create merge request" link with one to the MR when one existsDouglas Barbosa Alexandre2016-02-102-3/+7
|/
* Merge branch 'fix-explore-filter' into 'master' Dmitriy Zaporozhets2016-02-101-1/+1
|\ | | | | | | | | | | | | Add ajax filtering to all paged project lists. Fixes #13182 See merge request !2728
| * Cleanup to use one selectorfix-explore-filterJosh Frye2016-02-091-1/+1
| |
* | Ensure link for README blobs includes the full pathrs-issue-13254Robert Speicher2016-02-091-1/+1
| | | | | | | | Closes #13254
* | Merge branch 'variables-build-log' into 'master' Robert Speicher2016-02-091-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add notice about variables in build log Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 [ci skip] See merge request !2761
| * | Add information about expose of build variables.variables-build-logKamil Trzcinski2016-02-091-1/+3
| | |
* | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-02-095-9/+16
|\ \ \ | |_|/ |/| |
| * | Remove current_user && when can? is usedKamil Trzcinski2016-02-051-1/+1
| | |
| * | Merge branch 'master' into ci-permissionsKamil Trzcinski2016-02-0510-45/+40
| |\ \ | | |/ | | | | | | | | | # Conflicts: # db/schema.rb
| * | Merge remote-tracking branch 'origin/master' into ci-permissionsKamil Trzcinski2016-02-047-70/+66
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/builds/index.html.haml
| * | | Rename allow_guest_to_access_builds to public_buildsKamil Trzcinski2016-02-041-4/+4
| | | |
| * | | Properly handle commit status permissions (for a build)Kamil Trzcinski2016-02-031-4/+4
| | | |
| * | | Fix build errorsKamil Trzcinski2016-02-031-1/+5
| | | |
| * | | Add CI setting: allow_guest_to_access_buildsKamil Trzcinski2016-02-021-2/+6
| | | | | | | | | | | | | | | | Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
| * | | Make the CI permission model simplerKamil Trzcinski2016-02-024-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR simplifies CI permission model: - read_build: allows to read a list of builds, artifacts and trace - update_build: allows to cancel and retry builds - create_build: allows to create builds from gitlab-ci.yml (not yet implemented) - admin_build: allows to manage triggers, runners and variables - read_commit_status: allows to read a list of commit statuses (including the overall of builds) - create_commit_status: allows to create a new commit status using API Remove all extra methods to manage permission. Made all controllers to use explicitly the new permissions.
* | | | Add a tooltip to the stuck warning build symbolJeroen van Baarsen2016-02-081-1/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | We want to give people an idea of what is wrong with their build, we do this by adding a tooltip telling them where they can find more information about their broken builds. Fixes #10919 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Edited time ago location change.Jacob Schatz2016-02-053-10/+9
| | | | | | | | | | | | | | | | | | Change edited icon to word. Change edited text color to gray cc/ @creamzy
* | | Merge branch 'paginate-dashboard-projects' into 'master' Dmitriy Zaporozhets2016-02-051-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Page project list on dashboard See merge request !2689
| * | | Various filter fixesJosh Frye2016-02-041-1/+1
| | |/ | |/|
* | | Re-use top-are css component for issues/mr pagesDmitriy Zaporozhets2016-02-052-19/+19
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Allow link_to_label to take an optional type argrymai/gitlab-ce-3007-fix-mr-label-linksRémy Coutable2016-02-041-1/+1
| | | | | | | | | | | | | | | | | | You can set type: :merge_request to create a link to merge request lists instead of issues list. Accept both Symbol & String as type argument for the link_to_label helper
* | | Merge branch 'feature/jschatz1/issuable-sidebar' into 'master' Dmitriy Zaporozhets2016-02-044-14/+10
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | Implement new design for issue and merge request right sidebar Fixes #3981 See merge request !2645
| * | Issue sidebar bug fix.Jacob Schatz2016-02-031-2/+2
| | | | | | | | | | | | Thanks @rspeicher.
| * | Fix sidebar replacement for issues & MRsJacob Schatz2016-02-031-1/+1
| | |
| * | Sidebar works after sidebar ajax calls.Jacob Schatz2016-02-022-5/+5
| | |
| * | Add ajax calls to return JSONJacob Schatz2016-01-302-2/+0
| | | | | | | | | | | | | | | Fix subtitles on minimize. Fix styles for show.
| * | New right side gutter design.Jacob Schatz2016-01-272-8/+6
| | | | | | | | | | | | [WIP]
* | | Merge branch 'master' into use-top-areaDmitriy Zaporozhets2016-02-031-3/+0
|\ \ \ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Remove useless text tips on commonly used pagesDmitriy Zaporozhets2016-02-031-3/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Use top-area component for top page navigation for pages that contains list ↵Dmitriy Zaporozhets2016-02-034-33/+33
|/ / / | | | | | | | | | | | | | | | of items Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Make nav-controls responsive and hide on extra small screensDmitriy Zaporozhets2016-02-031-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Refactor nav controls section (search and new project/group btn)Dmitriy Zaporozhets2016-02-031-33/+31
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'git-raw-workhorse' into 'master' Jacob Vosmaer2016-02-021-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Send raw Git blobs via gitlab-workhorse See merge request !2451
| * \ \ Merge remote-tracking branch 'origin/master' into git-raw-workhorseJacob Vosmaer2016-02-021-1/+4
| |\ \ \ | | | |/ | | |/|