home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,298 Commits 48 Branches 340 Tags
2a52be9c3ebedcc8c512f64bb8cccdeebd15dd8a
Commit Graph
1153 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 8d240fb0e7 Show/hide issue assignee avatar depends on drag-n-drop column in milestone view 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-16 12:17:34 +03:00
Dmitriy Zaporozhets 6a7990c007 Remove garbage and apply wiki style 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 15:51:07 +03:00
Dmitriy Zaporozhets 054d68a3e9 Improve MR message for huge diffs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 12:58:08 +03:00
Dmitriy Zaporozhets 87fd342a23 Merge branch 'more-secure-api' into 'master' 
More secure api

Dont expose user email via API. Fixes #1314
 2014-06-14 09:39:01 +00:00
Dmitriy Zaporozhets ae564c97d4 Dont expose user email via API 
To prevent leaking of users info we reduce amount of user information
retrieved via API for normal users.

What user can get via API:

* if not admin: only id, state, name, username and avatar_url
* if admin: all user information
* about himself: all informaion

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 17:46:48 +03:00
Dmitriy Zaporozhets 5fdcaadf34 Merge branch 'fix-new-mr-502' into 'master' 
Fix 502 error on new merge request page

When diff is huge we try to render it that cause 502 error often.
After this patch we apply soft limits to diffs. So if diff is huge - we doing show it

Fixes #1323
 2014-06-13 13:15:41 +00:00
Dmitriy Zaporozhets 15c27192c0 Merge branch 'remove-wall' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-06-13 15:19:14 +03:00
Dmitriy Zaporozhets 59e1819561 Apply soft diff limits to MergeRequest#new page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 15:00:35 +03:00
Dmitriy Zaporozhets 1355ede49d Wipe wall notes feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:24:54 +03:00
Jacob Vosmaer 8761dd2a6f Check LDAP user filter during sign-in 2014-06-13 08:14:34 +02:00
Dmitriy Zaporozhets 98416ec9ab Show proper message for new MR when satellite fails 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 21:49:45 +03:00
Dmitriy Zaporozhets fcb0b76c32 Load last commit for files per 10 items. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-12 12:01:54 +03:00
Dmitriy Zaporozhets e740a00ed6 Prevent commit page error if cant collect branches where commit exists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 22:08:39 +03:00
Dmitriy Zaporozhets 0b00b3dac3 Add sorting to merge requests on milestone page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 17:11:52 +03:00
Dmitriy Zaporozhets dd86ce3f06 Sort issues in milestone 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 14:09:45 +03:00
Dmitriy Zaporozhets c4b02642d2 Replace milestone observer with services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 18:07:52 +03:00
Dmitriy Zaporozhets a7be3dfa30 Remove set of thread variables 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-10 17:51:49 +03:00
Dmitriy Zaporozhets 3dc0bce947 Add users to /:id route 
So now when you type site/:username it redirects you to users page.
And if you type site/:groupname it redirects you to group page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-07 15:06:55 +03:00
Dmitriy Zaporozhets 0fdce4a52b Refactor some search scopes to prevent wierd behaviour and PG::Error issues 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-05 20:37:35 +03:00
Dmitriy Zaporozhets f1ec62f465 Add reopened tab to milestone issues. Add ids and data to milestone issues to enable dragging 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 18:52:35 +03:00
Dmitriy Zaporozhets d95d56f0b9 Add current_user_id to gon vars 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 18:07:15 +03:00
Dmitriy Zaporozhets 4e249dadb5 Fix 500 error when generate labels on labels page. Fixes #1311 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-04 11:08:21 +03:00
Dmitriy Zaporozhets d986aea3f0 Merge branch 'upgrade_to_rails_4.1' into 'master' 
Upgrade to rails 4.1
 2014-06-04 07:33:25 +00:00
Marin Jankovski 18b1f171bd Rename snippets scopes to plural names. 2014-06-04 08:37:19 +02:00
Dmitriy Zaporozhets 7984e5b1ef Show events from all projects on user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 18:09:51 +03:00
Dmitriy Zaporozhets 729618c50f Merge branch 'ui-improvements' into 'master' 
Ui improvements
 2014-06-03 11:43:16 +00:00
Dmitriy Zaporozhets 95d61a094d Improve admin/projects page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 14:19:11 +03:00
Dmitriy Zaporozhets fc43c4e7fa Restyle admin/user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 12:44:22 +03:00
Marin Jankovski 7bf64b2648 Convert to array since Relation no longer returns an array. 2014-06-03 11:37:23 +02:00
Marin Jankovski 79f8abc51f Replace snippets scopes in view and controller. 2014-06-03 11:37:23 +02:00
Marin Jankovski 90c2e0d971 Replace now forbidden keywords public and private for snippets scope 2014-06-03 11:37:23 +02:00
Dmitriy Zaporozhets 3398e0a3d7 Revert "Implements and refactors clipboard feature for markdown." 
This reverts commit 2273234653.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/issues/_form.html.haml
	app/views/projects/merge_requests/_form.html.haml
	app/views/projects/merge_requests/_new_submit.html.haml
	app/views/projects/milestones/_form.html.haml
	app/views/projects/notes/_form.html.haml
	app/views/projects/wikis/_form.html.haml
 2014-06-03 10:56:40 +03:00
Dmitriy Zaporozhets 5a064b0249 Get group members only if group not nil 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 21:25:01 +03:00
Dmitriy Zaporozhets 144212fba2 Add members paginations to admin/project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 19:31:43 +03:00
Dmitriy Zaporozhets 9a4c8f7e41 Improve admin group page performance 
Add pagination for projects and members to /admin/groups/:group page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 18:58:00 +03:00
Dmitriy Zaporozhets e9de569458 Fix tests for user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 13:43:07 +03:00
Dmitriy Zaporozhets 72b295259e Show only personal projects on profile page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-30 18:22:59 +03:00
Dmitriy Zaporozhets f329d34ff3 Fix group projects fetch 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-29 22:03:42 +03:00
Dmitriy Zaporozhets 5b26b45dcb Improve group settings UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-29 21:30:20 +03:00
Dmitriy Zaporozhets e569cf369a Merge pull request #6991 from jvanbaarsen/branch-counter-after-delete 
Make sure the branch counter gets updated
 2014-05-29 15:39:46 +03:00
Dmitriy Zaporozhets 6fdd900827 Merge pull request #7014 from asedge/api_create_tag 
Add CreateTagService.  Use new service to allow tag creation through API.
 2014-05-29 15:37:42 +03:00
Job van der VoortandMarin Jankovski fd476cf620 render items from doc 2014-05-29 08:44:25 +02:00
Dmitriy Zaporozhets 13cbc82aa1 Merge branch 'master-create-group-projects' into 'master' 
Master can create group projects

It also includes Project transfer refactoring

Fixes #1284
 2014-05-28 17:12:28 +00:00
Dmitriy Zaporozhets 64b1956b0b Merge pull request #7032 from erbunao/markdown_clipboard 
Implements clipboard feature for markdown areas.
 2014-05-28 19:54:44 +03:00
Dmitriy Zaporozhets 900d30798b Use new Projects::TransferService class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:03:45 +03:00
erbunao 2273234653 Implements and refactors clipboard feature for markdown. 2014-05-28 22:51:47 +08:00
Sean Edge 2d4ba2679a Update tags_controller.rb to use CreateTagService. 2014-05-28 07:59:02 -04:00
Dmitriy Zaporozhets a18ae13e98 Backport CI service refactoring from EE 
It allows easier contribution of different CI services

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 11:35:43 +03:00
Dmitriy Zaporozhets affd376f7a Dont show remove source branch ckecbox/button if you dont have such 
permissions for MR page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-27 18:51:41 +03:00
Marin Jankovski 3b2b3cff04 Move logic to image_service. 2014-05-26 14:54:03 +02:00