home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,585 Commits 48 Branches 340 Tags
ec56ebb4cd3d413095a98e0ceae4f6d062e22521
Commit Graph
905 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets db93bec3fe Add group_access validation to ProjectGroupLink 2013-10-03 10:04:07 +03:00
Dmitriy Zaporozhets 0c5a9f20b5 Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee 
Conflicts:
	VERSION
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/models/merge_request.rb
	app/models/user.rb
	app/views/groups/_projects.html.haml
	config/routes.rb
	db/schema.rb
	doc/install/installation.md
 2013-09-27 15:24:54 +03:00
Johannes Becker fa8588827e Syntax cleanup 2013-09-25 16:54:34 +02:00
Johannes Becker 435a5ff8a1 Remove not needed attr_accessible 2013-09-25 01:09:33 +02:00
Johannes Becker 35597f61aa Simple PivotalTracker Source Commits Service 2013-09-25 00:56:25 +02:00
Hiroyuki Sato a3ef683108 Drop support of root namespace in model 2013-09-17 23:05:42 +09:00
Dmitriy Zaporozhets a51562d6d9 Fix setting default values for user 2013-09-14 20:51:16 +03:00
Izaak Alpert 88d4559e62 Removed private scope 
Change-Id: Ia723321a5cb05deb626d34c7d8d78194e049b1f0
 2013-09-11 14:32:24 -04:00
Izaak Alpert 810851f574 Style updates 
Change-Id: Ib4eb533dff5c722fe559330e4aa71b5d5baf6fb8
 2013-09-11 14:04:15 -04: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
Izaak Alpert d4d4a78f83 Update User api to respect default settings 
-API now respects default_projects_limit, default_can_create_group, and default_can_create_team

Change-Id: I059d060d576df1050e5371e707381c5e8c608a7a
 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
Stephen Holdaway e19526c2ac Fix several_namespaces? to work with multiple ownership of groups 2013-09-12 00:10:45 +12:00
Izaak Alpert 7a56075efa Some of the requested updates, rebase on master 
Change-Id: I305266fe9acbbb5136adeeb52e7e4e1d6629a30a
 2013-09-09 12:04:38 -04:00
Dmitriy Zaporozhets 76a0739454 Add description to MergeRequest model 2013-09-09 16:32:43 +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 6263598314 Respect group members in mentionable concern 2013-09-04 17:05:48 +03:00
Dmitriy Zaporozhets 3707cc119b Refactor Gitlab::Auth 2013-09-04 00:12:00 +03:00
Dmitriy Zaporozhets 6bf117c601 Mode User+LDAP functionality from Gitlab::Auth 2013-09-02 23:35:40 +03:00
Dmitriy Zaporozhets 99eefcb54d Invalidate events cache when project was moved 2013-08-29 19:12:22 +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 bbc916baee If user is owner of project it cant be removed from this project 2013-08-27 12:47:28 +03:00
Dmitriy Zaporozhets 9fbbd6a68e Return empty abilities if user is blocked 2013-08-27 12:41:49 +03:00
Dmitriy Zaporozhets 6545527853 Improve user block logic 
When block user - remove it from joined groups
Dont remove user from own resources (groups, users)
 2013-08-27 12:01:45 +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 dc4f25286e Merge branch '6-0-stable' of https://github.com/gitlabhq/gitlabhq 2013-08-22 17:52:13 +03:00
Dmitriy Zaporozhets 86c9737307 Fix issue when project owner cant close MR from forked project 2013-08-22 17:50:24 +03:00
Dmitriy Zaporozhets d2aa48c0d5 Recreate project satellite on rename or transfer 2013-08-22 14:49:57 +03:00
Dmitriy Zaporozhets 8dd37afe34 Reannotate 2013-08-21 12:34:02 +03:00
Dmitriy Zaporozhets fd1661468f Remove can_create_team code from user 2013-08-21 12:31:47 +03:00
Dmitriy Zaporozhets 625fb2f29d Add iids to milestones. Moved iids logic to separate concern 2013-08-21 12:16:26 +03:00
Dmitriy Zaporozhets 5d8ca6e60b Remove deprecated models 2013-08-21 12:08:32 +03:00
Dmitriy Zaporozhets e04f375638 Merge branch '6-0-stable' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
 2013-08-21 11:57:43 +03:00
Dmitriy Zaporozhets 395f3a1d20 Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhq 2013-08-20 19:30:38 +00:00
Dmitriy Zaporozhets 817b9d1b47 Merge branch 'refactor/access_roles' of /home/git/repositories/gitlab/gitlabhq 2013-08-20 19:10:40 +00:00
Dmitriy Zaporozhets d04ad4cb5d Merge pull request #4812 from hiroponz/remove-dependancy-of-grit 
Remove the dependancy of grit from class Network::Graph
 2013-08-20 12:09:35 -07:00
Dmitriy Zaporozhets 25e629e460 Render small avatars for inline events 2013-08-20 21:31:37 +03:00
Dmitriy Zaporozhets 23f53c43ce Rename wiki repo if project repo was removed 2013-08-20 17:44:15 +03:00
Dmitriy Zaporozhets 9acaec7a26 Searching for issue/mr by iid in markdown 2013-08-20 17:31:26 +03:00
Dmitriy Zaporozhets 7a26a4b69d Refactor access roles methods 2013-08-20 15:59:45 +03:00
Dmitriy Zaporozhets 6141516174 Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq 
Conflicts:
	VERSION
 2013-08-20 14:02:00 +03:00
Dmitriy Zaporozhets 348653bc83 ProjectGroupLink access level 
Now you can specify max access level for shared projects
 2013-08-20 13:59:43 +03:00
Hiroyuki Sato fd0afcc996 Remove the dependancy of grit from class Network::Graph 2013-08-20 12:05:23 +09:00
Dmitriy Zaporozhets 434c034159 Iid improvemets 
* call set_iid before validation
* make rake task pass event if objects are invalid
* show iid in comment event at dashboard
 2013-08-19 22:53:11 +03:00
Dmitriy Zaporozhets 20397091f1 Show iid in event feed and uatocomplete as default id for issues, mr 2013-08-19 22:12:59 +03:00
Dmitriy Zaporozhets 7047a44a26 Sett iid on create. Use iid as value to_param 2013-08-19 22:10:56 +03:00
Dmitriy Zaporozhets 0e387919c3 Fixed wrong last-edit time for wiki 2013-08-16 16:59:26 +03:00
Dmitriy Zaporozhets 860a80ea57 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/assets/stylesheets/common.scss
	db/schema.rb
 2013-08-16 14:37:51 +03:00
Dmitriy Zaporozhets d0a95c30b9 Ensure project discover default branch on Project#show 2013-08-15 12:27:19 +03:00