home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
224 Commits
Author SHA1 Message Date
Douwe Maan 36bd6c8494 Show who last edited a comment if it wasn't the original author 2015-07-30 14:45:54 +02:00
Valery Sizov 6454bcbfa4 revert cache issue 2015-07-22 17:53:18 +03:00
Dmitriy Zaporozhets 70666a52b4 Use to_reference menthod when render issue id in list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-01 09:46:37 +02:00
Dmitriy Zaporozhets 40e31e1db3 Cache issue in the list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-30 15:48:19 +02:00
Dmitriy Zaporozhets 342d553709 Rename abilities to correspond contoller/model action names 
write_ was renamed to create_
modify_  was renamed to update_

So now in update action we have next code

def create
  can?(current_user, :create_issue, @issue)
end

def update
  can?(current_user, :update_issue, @issue)
end

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-26 15:55:56 +02:00
Dmitriy Zaporozhets d5947ada44 Simplify set of assignee, milestone and label to admin_issue rule 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-26 15:45:45 +02:00
Dmitriy Zaporozhets b9fa82daee Update tests and use js-issuable class for context form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-26 15:05:30 +02:00
Dmitriy Zaporozhets 2d31568b27 Refactor issue and merge request sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 16:04:50 +02:00
Dmitriy Zaporozhets 60baa1e866 Move issuable partials in common directory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 15:11:22 +02:00
Dmitriy Zaporozhets a5f23435f7 Improve performance for issue#show page 
* store @participants in variable
* store result of subscribed? call into variable

In total it reduce amount of SQL queries for issue with 10 comments/participants twice.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-24 12:49:34 +02:00
Robert Speicher 8c8cd8be43 Update time_ago_with_tooltip helper 
Minor refactoring, add specs, changes arguments to use keywords.
 2015-06-17 16:37:10 -04:00
Dmitriy Zaporozhets 9b77a4baf9 Dont truncate issue/mr title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 16:33:33 +02:00
Douwe Maan 4ae67fcaef Show warning when a comment will add 10 or more people to the discussion. 2015-06-05 12:07:13 +02:00
Douwe Maan 45e4727f97 Set milestone on new issue when creating issue from index with milestone filter active. 2015-05-27 14:22:11 +02:00
Dmitriy Zaporozhets 9eec0d5436 Merge branch 'accepted-rejected-mrs' into 'master' 
Add Accepted and Rejected tabs to MR lists.

Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites.

![Screen_Shot_2015-05-25_at_17.02.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b0bf43aa1b5b9898a1c6b204dbcf669a/Screen_Shot_2015-05-25_at_17.02.31.png)

![Screen_Shot_2015-05-25_at_17.02.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2ac05b1e1dba3b2d1692bd9242078f3a/Screen_Shot_2015-05-25_at_17.02.47.png)

![Screen_Shot_2015-05-25_at_17.03.03](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4c0f0fa869c9130a6af18d80a1c6ebed/Screen_Shot_2015-05-25_at_17.03.03.png)

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201.

See merge request !702
 2015-05-27 11:40:36 +00:00
Douwe Maan d25026a512 Add Accepted and Rejected tabs to MR lists. 2015-05-25 17:01:27 +02:00
Robert Speicher 9bdd7f34a5 Add link_to_label helper 2015-05-21 23:40:25 -04:00
Douwe Maan 9a60441ce4 Fix Atom feeds. 2015-05-21 11:39:33 +02:00
Robert Speicher 725ff58bc8 Don't add js-task-list-container to things the user can't edit 2015-05-06 13:00:13 -04:00
Robert Speicher 5c7b91e29b Single quotes/icon helper in views 2015-05-06 13:00:11 -04:00
Robert Speicher 6883e6e084 Remove all references to parse_tasks 2015-05-06 12:58:28 -04:00
Robert Speicher a3d55db910 Update task list behavior for Issues 2015-05-06 12:58:27 -04:00
Sullivan SENECHAL 5bc5188a06 Fix missing button types 2015-05-05 00:45:06 +02:00
Douwe Maan ae09c2a6db Capitalize "X" in "New X". 2015-04-30 21:33:02 +02:00
Douwe Maan 26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Sullivan SENECHAL f28f5e49f6 Fix wrong placement of show-aside link 2015-04-27 00:43:02 +02:00
Dmitriy Zaporozhets 9409f2a3b3 Merge pull request #9065 from rumpelsepp/issues 
Tweak issue page a bit
 2015-04-24 15:01:27 +03:00
Stefan Tatschner dbd0fd20a9 Tweak issue page 
* Include creation time
* Include author without avatar
* Move assignee to the right
* Remove action buttons. IMO they are useless and a bit annoying
* Include comments counter by default, gray it out when there are 0
  comments.
 2015-04-24 09:36:42 +02:00
Douwe Maan a12d50c5e5 Remove unnecessary private_token params. 2015-04-23 17:11:39 +02:00
Douwe Maan 9c60354a6a Make links and titles of atom feeds consistent. 2015-04-23 17:11:39 +02:00
Douwe Maan 8917ae39e3 Add atom link tag to every page that has one. 2015-04-23 17:11:38 +02:00
Dmitriy Zaporozhets ecb58dacd6 Merge branch 'reference-access-control' into 'master' 
Only allow users to reference groups, projects, issues, MRs, commits they have access to.

Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183.

See merge request !1742
 2015-04-13 14:10:25 +00:00
Stan Hu 3d2c387840 Move current user to the top of the list in author/assignee filters 
Closes #1321
 2015-04-09 01:04:53 -07:00
Douwe Maan e62b5a2b07 Only allow user to see participants from groups they have access to. 2015-04-02 10:57:01 +02:00
Dmitriy Zaporozhets 6664da431a Small css improvements to selectboxes and issue filter 2015-03-27 14:28:24 -07:00
Dmitriy Zaporozhets d6c8eefb5d Big refactoring of issues filters 
* Squash project users selectbox and users selectbox into one class
* Move from API autocomplete to GitLab internal one
* Smarter filter for project/group/all issues
* Use selectbox with searchbox for assignee/author/milestone/label
* Switch to ajax filter for issue author/assignee
 2015-03-26 19:13:49 -07:00
Dmitriy Zaporozhets a1d09190e3 Prevent unnecessary doubling of js events on import pages and user calendar 2015-03-25 21:45:01 -07:00
Douwe Maan 6b92236eeb Don't include system notes in issue/MR comment count. 2015-03-23 16:43:08 +01:00
Dmitriy Zaporozhets 085e5084a8 Make issue and merge request sidebar more compact 
* move votes block to participants
* make smaller font in sidebar
 2015-03-20 12:50:45 -07:00
Dmitriy Zaporozhets 479020ec6b Fix project issues and merge requests pages 2015-03-19 18:27:26 -07:00
Dmitriy Zaporozhets df8b4ab459 Merge pull request #8662 from yglukhov/mr-and-issue-links 
Make MR and issue numbers clickable links in MR and issue lists.
 2015-03-19 15:17:07 -07:00
Dmitriy Zaporozhets e25b1107c8 Refactor select css. Make selects same width 2015-03-18 20:46:26 -07:00
Valery Sizov 847bd0d0e5 fix public issue 2015-03-18 02:16:10 -04:00
Dmitriy Zaporozhets 9162e34bb0 Merge branch 'issue_subscription' into 'master' 
Subscription to issue/mr

Fixes #1911 and #1909

![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png)

![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png)

See merge request !1702
 2015-03-17 16:45:04 +00:00
Valery Sizov 22fcb2f418 improve UI 2015-03-17 17:11:57 +02:00
Valery Sizov 1b437ec349 tests 2015-03-16 21:38:41 +02:00
Valery Sizov 410d25c8ca rename table subscribe; make it polymorfic 2015-03-16 15:22:50 +02:00
Valery Sizov 9698b36c1c Subscription 2015-03-15 19:44:59 +02:00
Dmitriy Zaporozhets 30ca451fd4 Refactor buttons 2015-03-14 00:29:32 -07:00
Dmitriy Zaporozhets 80b2f3fb86 Implement merge requests search 
It is same search like we have at issues page. It allows to quickly
filter merge requests based on title or desription. I copy-pasted some
js code from Issues.js. In future search (filtering) logic should be
refactoed into one class for merge requests and issues
 2015-03-12 16:20:58 -07:00