home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,846 Commits 48 Branches 340 Tags
v6.2.2
Commit Graph
901 Commits
Author SHA1 Message Date
arulandDmitriy Zaporozhets 2f47049ddc Fix for issue #5431 2013-10-25 17:53:08 +03:00
Angus MacArthur aefe2e952f Fixing unsafe use of Thread.current variable :current_user 2013-10-16 01:20:53 -04:00
Dmitriy Zaporozhets 01186f9fc6 Show confirmation status in profile 2013-10-15 11:19:19 +03:00
Dmitriy Zaporozhets 2e8b0fa5cf Oauth users and users created by admin should be confirmed immediatly 2013-10-15 09:59:58 +03:00
Dmitriy Zaporozhets 3cbfb1ee7c Remove .git from project url end redirect 
Ex. redirect from
  localhost/group/project.git
to
  localhost/group/project

It used to prevent 404 error when follow submodule http link
like http://localhost/group/project.git
 2013-10-14 13:27:39 +03:00
Dmitriy Zaporozhets e50c0d5cb7 Fix spinach profile tests 2013-10-09 17:01:04 +03:00
Dmitriy Zaporozhets ffec158de4 Restyle Profile#Account page 2013-10-09 16:43:24 +03:00
Dmitriy Zaporozhets 4c8224ae1e Move profile account to separate controller 2013-10-09 16:43:17 +03:00
Dmitriy Zaporozhets c41e66db52 Separate page for password change 2013-10-09 16:43:11 +03:00
Dmitriy Zaporozhets 2eb76186f5 Merge pull request #5158 from tkoenig/fix-active-milestone-order 
Sort active milestones by due date (upcoming first)
 2013-10-07 03:35:09 -07:00
Dmitriy Zaporozhets 970d86b7c5 Refactor blob finding 2013-10-01 20:34:41 +03:00
Dmitriy Zaporozhets 1d3f03fb69 Fix blob and repo stuff after gitlab_git v3 2013-10-01 18:26:55 +03:00
Dmitriy Zaporozhets 836c870cc9 Fix edit file 2013-10-01 17:08:40 +03:00
Dmitriy Zaporozhets ae9dd62762 Update code to work with gitlab_git 3 2013-10-01 17:00:28 +03:00
Dmitriy Zaporozhets 052a7cc9cd Merge branch 'patch-2' of https://github.com/zzet/gitlabhq into zzet-patch-2 
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
 2013-09-26 22:19:01 +03:00
Dmitriy Zaporozhets 5e843a1769 Explain on dashboard that limit amount of projects displayed 2013-09-26 19:46:31 +03:00
Dmitriy Zaporozhets 65b9768ccf Group ownership completely based on users_groups relation now 
Before we have only owner_id to determine group owner
With multiple owners per group we should get rid of owner_id in group.
So from now @group.owner will always be nil but
@group.owners return an actual array of users who can admin this group
 2013-09-26 14:49:22 +03:00
Dmitriy Zaporozhets 3cb663f5c9 Remove project transfer page since we already have multiple owners for group 2013-09-26 10:33:06 +03:00
Dmitriy Zaporozhets 02cf9aa687 Group owner or admin can remove other group owners 2013-09-26 10:28:43 +03:00
Dmitriy Zaporozhets 573d367be5 Modify permissions for project and group 
* Hooks and team pages allowed only for masters/owners
* Group page allowed for admin
* Corrent authentication for Projects controller
* Hide some project elements from visitor
 2013-09-25 14:05:35 +03:00
Dmitriy Zaporozhets 2f6342978b Public projects feature - step2 
* Render right layout depends on current_user
* show sample git username/email when repo is empty
* Show extra info when browsing public area
* Fixed some tests related to public projects
* show comments in read-only for public projects
* Remove old public routing
 2013-09-24 22:14:28 +03:00
Dmitriy Zaporozhets 09cb2ba815 Fix password update 2013-09-24 22:12:48 +03:00
Dmitriy Zaporozhets ffd0a985ee Point to project page from public area 2013-09-24 16:00:21 +03:00
Dmitriy Zaporozhets 66998f6d46 Allow non authenticated user access to public projects 2013-09-24 15:58:39 +03:00
Dmitriy Zaporozhets 642398285d Force user to provide old password in order to change it 2013-09-24 10:48:36 +03:00
Thomas König 5fba1d95fd Sort active milestones by due dates (closest first) 2013-09-23 18:41:26 +02:00
Izaak Alpert 61a86101e8 Prevent empty public projects from throwing exceptions 
GITLAB-1279 (GITLAB-1264)

Change-Id: Ifb5b4313bc91fae720f8ef5c36152c45e9d38934
 2013-09-20 11:42:38 -04:00
Izaak Alpert ca1b67ce38 Don't show users password change page if ldap users 2013-09-17 22:38:08 -04:00
Dmitriy Zaporozhets 9c629a1ebc Update gitlab_git to version 2.2.0. Fixes invalid diff in Compare 2013-09-16 13:33:34 +03:00
Izaak Alpert 5dae40f579 Update to only provide one way to get a default user 
-calling build_user will now apply defaults and only override them if as: :admin is set

Change-Id: Id1d938c0967752ecc14370af54f2d88128d18c44
 2013-09-11 14:04:15 -04:00
Dmitriy Zaporozhets 694768e518 Fix 404 if Group guest visit empty group page 2013-09-11 21:00:16 +03:00
Boyan Tabakov 01ff084a4d Improved large commit handling. 
Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account.

A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server
resource usage with huge commits.

Related to #1745, #2259

In addition, handle large commits for MergeRequests and Compare controllers.

Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
 2013-09-07 14:44:03 +03:00
Dmitriy Zaporozhets 496ec8b26d Merge branch 'refactor/oauth' of /home/git/repositories/gitlab/gitlabhq 2013-09-04 13:49:03 +00:00
Dmitriy Zaporozhets 8e238f4273 Fix user remove tests. Remove user even if he has projects 2013-09-04 16:20:40 +03:00
Dmitriy Zaporozhets 9028999c93 Use new OAuth classes 2013-09-04 00:06:29 +03:00
Dmitriy Zaporozhets 38cebe03bc Dont allow html render for RAW view 2013-09-03 20:55:01 +03:00
Dmitriy Zaporozhets 6bf117c601 Mode User+LDAP functionality from Gitlab::Auth 2013-09-02 23:35:40 +03:00
Dmitriy Zaporozhets b320884149 List groups on Dashboard#projects page 2013-08-29 21:45:19 +03:00
Dmitriy Zaporozhets 643a6e5824 Improve admin user show page 
Show permissions for all project.
Add ability to remove user from group if not an owner
Remove unnecessary admin controller
 2013-08-27 21:39:34 +03:00
Dmitriy Zaporozhets 24e26d8b7a Improve user block/removal from admin area 
Provide UI with explanation what happens when you block or remove user
When remove user - remove all groups where user is an only owner
 2013-08-27 21:39:34 +03:00
Dmitriy Zaporozhets afdfbd1e8a Add description to user removal block. Transfer owned groups to admin before remove 2013-08-27 21:39:34 +03:00
Dmitriy Zaporozhets 17af835387 Add event filter for group and project show pages 2013-08-26 16:30:03 +03:00
Dmitriy Zaporozhets dc016fef39 Add redirect from Issue#id to Issue#iid 2013-08-26 14:15:21 +03:00
ash wilson c8a115c0e3 Link issues from comments and automatically close them 
Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
 2013-08-25 18:58:41 -04:00
Dmitriy Zaporozhets 5a3d4cb634 Fixed 500 error when try to remove group 2013-08-24 22:42:52 +03:00
Dmitriy Zaporozhets e67574fe77 Merge pull request #4829 from hiroponz/render-not-found-when-failing-to-look-for-commit 
Render not found when failing to look for commit
 2013-08-21 04:11:52 -07:00
Dmitriy Zaporozhets fb492386c5 Fix accidentally removed class name 2013-08-21 12:33:12 +03:00
Dmitriy Zaporozhets fd1661468f Remove can_create_team code from user 2013-08-21 12:31:47 +03:00
Dmitriy Zaporozhets 606701ada4 Look for milestone by iid in milestone controller 2013-08-21 12:22:18 +03:00
Hiroyuki Sato 5f24bdb7d0 Render not found when failing to look for a commit 2013-08-21 17:53:51 +09:00