home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,943 Commits 48 Branches 340 Tags
54aa0969d40549014bee6e4e500276405fb055ee
Commit Graph
2737 Commits
Author SHA1 Message Date
Douwe Maan ff28ac9c18 Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' 
Add ability to see and sort on vote count from Issues and MR lists

Fixes #3763

* Sort options

![Sort Options](/uploads/df6543d574d4df8bf7e4496a876e2930/sort.png)

* Most popular

![Most popular](/uploads/bb92cc2fbef7b6b806dcdf8c52778fdd/most-popular.png)

* Least popular

![Least popular](/uploads/7988ed451922c81dc228419b5edbd7cd/least-popular.png)

See merge request !2781
 2016-02-17 17:20:35 +00:00
Douwe Maan cb2591e83f Merge branch 'image-diff' into 'master' 
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
 2016-02-17 14:06:10 +00:00
Douwe Maan 534d480993 Merge branch 'fix/13517-impossible-subsequent-issuable-edits-in-sidebar' 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
 2016-02-17 14:01:30 +00:00
Douglas Barbosa Alexandre 9823d00e0b Add ability to see and sort on vote count from Issues and MR lists 2016-02-17 11:32:02 -02:00
Jacob Schatz 943bed68bc Merge branch 'issue_13359' into 'master' 
Prevents floated button group on issues view

Issue #13359 

![screenshot](/uploads/962ac4f3f1f3d6ef87f7152c09090801/screenshot.jpg)

See merge request !2826
 2016-02-17 11:30:26 +00:00
Jacob Vosmaer a87fe2a472 Fixes requested by Rémy 2016-02-17 11:08:47 +01:00
Jacob Vosmaer 016367c640 No use to sanitize partial blob data 2016-02-17 11:08:10 +01:00
Rémy Coutable c569f8b480 Fix a bug preventing from doing subsequent edits in any Issuable sidebar 2016-02-17 10:17:57 +01:00
Jacob Vosmaer 24fa458615 Use /raw/ requests for image diffs 2016-02-16 17:29:45 +01:00
Alfredo Sumaran 6d80a4c4f9 Wrap issue details to prevent content misalignment 2016-02-16 11:06:15 -05:00
Jacob Vosmaer 15126fc70f Fix SVG blob rendering 2016-02-16 17:01:25 +01:00
Alfredo Sumaran 18390c6a91 Change "opened by" to just "by" 2016-02-16 09:30:34 -05:00
Rémy Coutable 5cd20de749 Eager-load image blob data in diffs 
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.
 2016-02-16 10:50:24 +01:00
Alfredo Sumaran 807765b6a7 Move issue details after action buttons 2016-02-15 16:29:22 -05:00
Douwe Maan 0174263c9b Merge branch 'rs-issue-merge-requests' into 'master' 
Correct indentation for `issues/merge_requests` partial render

Prior, it would only be shown if the issue had been edited.

See merge request !2789
 2016-02-12 17:30:43 +00:00
Rubén Dávila 4d1e82e0bb Don't show fork button if user can't fork the project. 2016-02-11 19:02:52 -05:00
Robert Speicher 20e47eadae Correct indentation for issues/merge_requests partial render 
Prior, it would only be shown if the issue had been edited.
 2016-02-11 11:17:45 -05:00
Douglas Barbosa Alexandre 202bf71da8 Change MR link to "View Open Merge Request" 2016-02-10 10:47:59 -02:00
Douglas Barbosa Alexandre 1353cff5fe Replaces "Create merge request" link with one to the MR when one exists 2016-02-10 10:32:25 -02:00
Dmitriy Zaporozhets 22808a2221 Merge branch 'fix-explore-filter' into 'master' 
Add ajax filtering to all paged project lists. Fixes #13182



See merge request !2728
 2016-02-10 08:31:36 +00:00
Josh Frye cf8a74be5f Cleanup to use one selector 2016-02-09 20:21:47 -05:00
Robert Speicher d1f10c6666 Ensure link for README blobs includes the full path 
Closes #13254
 2016-02-09 17:56:15 -05:00
Robert Speicher 4317b22741 Merge branch 'variables-build-log' into 'master' 
Add notice about variables in build log

Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942

[ci skip]

See merge request !2761
 2016-02-09 21:34:46 +00:00
Robert Speicher 7ea60fbfc8 Merge remote-tracking branch 'dev/master' into 'master' 2016-02-09 12:13:58 -05:00
Kamil Trzcinski 078ec5e414 Add information about expose of build variables. 2016-02-09 01:08:49 +01:00
Jeroen van Baarsen d38c17739e Add a tooltip to the stuck warning build symbol 
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>
 2016-02-08 08:16:06 +01:00
Kamil Trzcinski 0806476761 Remove current_user && when can? is used 2016-02-05 20:17:58 +01:00
Kamil Trzcinski 170ca8435a Merge branch 'master' into ci-permissions 
# Conflicts:
#	db/schema.rb
 2016-02-05 20:15:32 +01:00
Jacob Schatz 80812a5d46 Edited time ago location change. 
Change edited icon to word.
Change edited text color to gray
cc/ @creamzy
 2016-02-05 11:31:13 -05:00
Dmitriy Zaporozhets 9bf85c01a9 Merge branch 'paginate-dashboard-projects' into 'master' 
Page project list on dashboard



See merge request !2689
 2016-02-05 15:02:47 +00:00
Dmitriy Zaporozhets 9258636021 Re-use top-are css component for issues/mr pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-05 11:35:55 +01:00
Rémy Coutable 6e79ce2efd Allow link_to_label to take an optional type arg 
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
 2016-02-04 19:14:48 +01:00
Josh Frye 2ad094132d Various filter fixes 2016-02-04 13:03:41 -05:00
Dmitriy Zaporozhets 34edb3abe7 Merge branch 'feature/jschatz1/issuable-sidebar' into 'master' 
Implement new design for issue and merge request right sidebar

Fixes #3981 



See merge request !2645
 2016-02-04 18:01:29 +00:00
Kamil Trzcinski 6fea7c386f Merge remote-tracking branch 'origin/master' into ci-permissions 
# Conflicts:
#	app/views/projects/builds/index.html.haml
 2016-02-04 13:16:48 +01:00
Kamil Trzcinski b4c36130cc Rename allow_guest_to_access_builds to public_builds 2016-02-04 12:57:46 +01:00
Dmitriy Zaporozhets 088742551d Merge branch 'master' into use-top-area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-03 22:51:19 +01:00
Jacob Schatz bb81eff4bf Issue sidebar bug fix. 
Thanks @rspeicher.
 2016-02-03 15:49:30 -05:00
Jacob Schatz d6d3a132b8 Fix sidebar replacement for issues & MRs 2016-02-03 14:45:08 -05:00
Dmitriy Zaporozhets a441658783 Remove useless text tips on commonly used pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-03 18:51:52 +01:00
Dmitriy Zaporozhets 8cd25901d3 Use top-area component for top page navigation for pages that contains list of items 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-03 18:41:55 +01:00
Dmitriy Zaporozhets ad5acec6e5 Make nav-controls responsive and hide on extra small screens 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-03 16:14:11 +01:00
Dmitriy Zaporozhets 4beae990b3 Refactor nav controls section (search and new project/group btn) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-03 16:14:11 +01:00
Kamil Trzcinski c3d897a9a3 Properly handle commit status permissions (for a build) 2016-02-03 13:33:47 +01:00
Kamil Trzcinski e80c79e3ad Fix build errors 2016-02-03 12:41:16 +01:00
Jacob Schatz 599e554ad4 Sidebar works after sidebar ajax calls. 2016-02-02 19:42:19 -05:00
Jacob Vosmaer 752468d55b Merge branch 'git-raw-workhorse' into 'master' 
Send raw Git blobs via gitlab-workhorse



See merge request !2451
 2016-02-02 17:22:04 +00:00
Kamil Trzcinski 627909c2a4 Add CI setting: allow_guest_to_access_builds 
Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
 2016-02-02 17:59:37 +01:00
Jacob Vosmaer 15a1acb479 Merge remote-tracking branch 'origin/master' into git-raw-workhorse 2016-02-02 15:06:19 +01:00
Jacob Vosmaer d3affe8bca Merge remote-tracking branch 'origin/master' into lazy-blobs 2016-02-02 15:04:54 +01:00