home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,727 Commits 48 Branches 340 Tags
09f211ef4f032b7dfbc333754569896b34f0649f
Commit Graph
1481 Commits
Author SHA1 Message Date
Marin Jankovski 6bcb1a033f Add removal and addition of the user to the group membership to audit events. 2014-11-21 16:51:06 +01:00
Marin Jankovski 4713fbd239 Add removal and addition of the user to the project membership to audit events. 2014-11-21 16:08:12 +01:00
Marin Jankovski b68e1123fb Move event creation to service. 2014-11-21 12:32:12 +01:00
Marin Jankovski f90db27e2a Add audit events feature spec for project. 2014-11-20 11:54:05 +01:00
Marin Jankovski e348c6512f Add group audit events. 2014-11-20 08:54:49 +01:00
Marin Jankovski 2d1b88c1a0 Paginate audit events page and add time column. 2014-11-19 16:32:49 +01:00
Marin Jankovski 4734c3a797 Create an audit events overview on the project settings page. 2014-11-19 16:18:30 +01:00
Marin Jankovski bcaf86da60 Add a route to project audit_events. 2014-11-19 16:16:46 +01:00
Jacob Vosmaer 11b3a05946 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-11-17 15:41:52 +01:00
Marin Jankovski 334fe86574 Sanitize branch name and ref name 2014-11-13 16:20:43 +01:00
Valery Sizov 3fcd75a911 Merge CE master into EE master 
Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb
 2014-11-13 17:05:12 +02:00
Valery Sizov 3aa59d369e Merge branch '7-4-stable-ee' into ee_master 
Conflicts:
	CHANGELOG-EE
	VERSION
 2014-11-11 11:35:18 +02:00
Dmitriy Zaporozhets c3e83d4771 Merge branch 'auth_duplication' into 'master' 
Remove unnecessary authorisations

Because we already check read_project ability in `before_filter :project`

See merge request !1240
 2014-11-05 15:23:26 +00:00
Valeriy Sizov f9814bf288 Merge pull request #8094 from cirosantilli/rm-unused-authenticate_user 
Remove unused authenticate_user from project#show
 2014-11-05 16:31:11 +02:00
Valery Sizov 6f34d40436 remove auth duplication 2014-11-05 11:04:08 +02:00
Valery Sizov c9470f5c78 Ability to block commits with certain filenames 2014-11-03 18:22:43 +02:00
Valery Sizov 76764338dd Git Hook to check whether author is a GitLab member 2014-10-31 16:19:58 +02:00
Dmitriy Zaporozhets 961a6bfcc2 API delete branch: render branch name json instead of true 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-30 17:28:59 +02:00
Valery Sizov 1a97c3c4aa Merge branch '7-4-stable-ee' into 7-4-stable_non_conflict 
Conflicts:
	CHANGELOG
	VERSION
 2014-10-29 16:13:36 +02:00
Valery Sizov 1ab1526d92 Fix raw view for public snippets 2014-10-29 16:11:28 +02:00
Valery Sizov a62ad80a0f Git hooks for checking email 2014-10-29 11:42:51 +02:00
Drew Blessing 776bca07cd Add Atlassian Bamboo service 2014-10-28 05:20:36 -05:00
Dmitriy Zaporozhets beabf5db8c Merge pull request #8091 from cirosantilli/factor-ability-abilities 
Factor abilities methods
 2014-10-28 12:09:55 +02:00
Dmitriy Zaporozhets f4178f9601 Merge pull request #8005 from cirosantilli/settings-to-gitlab-config 
Use Gitlab.config instead of Settings everywhere
 2014-10-27 19:18:48 +02:00
Valery Sizov 40c8f159a2 Fix raw view for public snippets 2014-10-27 11:51:31 +02:00
Valery Sizov dd559674e2 Merge branch '7-4-stable-ee' into ce_stable 
Conflicts:
	VERSION
	lib/gitlab/ldap/adapter.rb
 2014-10-24 13:37:25 +03:00
Valery Sizov 5f7906e163 fix for public snippet 2014-10-24 12:52:59 +03:00
Valery Sizov 705652d625 fix for public snippet 2014-10-24 11:52:52 +03:00
Valery Sizov 91402ac0eb Merge branch '7-4-stable' into ee_stable 2014-10-21 13:48:16 +03:00
Dmitriy Zaporozhets 6c8d3bd658 Merge pull request #8093 from cirosantilli/rm-duplicate-derived-admin-repository-method 
Remove unused admin/projects#repository method
 2014-10-21 13:01:07 +03:00
Dmitriy Zaporozhets c36a9e4cbf Merge pull request #8029 from cirosantilli/rm-projects-controller-filter 
Remove unused filter from ProjectsController
 2014-10-21 11:58:08 +03:00
Ciro Santilli 2c98584a9c Remove unused admin/projects#repository method 
Already defined on the ApplicationController base class.
 2014-10-21 10:56:11 +02:00
Dmitriy Zaporozhets 1657750a6a Merge pull request #8028 from cirosantilli/rm-dev-tools 
Remove unused dev_tools helper.
 2014-10-21 11:55:36 +03:00
Dmitriy Zaporozhets 8ad9a75f88 Merge pull request #8030 from cirosantilli/factor-authorize 
Factor authorize_push! and authorize_code_access!
 2014-10-21 11:43:12 +03:00
Dmitriy Zaporozhets 5ce9f89c7b Merge pull request #8102 from cirosantilli/use-memoized-project 
Use @project on controllers, don't call method
 2014-10-21 11:41:03 +03:00
Dmitriy Zaporozhets 456de99b9b Merge pull request #8101 from cirosantilli/rm-project-id-admin-project-controller 
Remove param[:project_id] at admin controller
 2014-10-21 11:40:46 +03:00
Ciro SantilliandDmitriy Zaporozhets db5ea013f4 Use :message key, not :error for File::Service. 2014-10-21 11:37:15 +03:00
Valery Sizov e769822595 Merge branch '7-4-stable' into to_ee_stable_from_ce_stable 
Conflicts:
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
	features/admin/groups.feature
	features/steps/admin/groups.rb
 2014-10-20 19:59:36 +03:00
Dmitriy Zaporozhets 644fd232db Add tests for remove group member feature in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 16:37:52 +03:00
Dmitriy Zaporozhets 72abe9f679 Merge branch 'fix-group-member-remove' into 'master' 
Fix group member remove

Fixes https://github.com/gitlabhq/gitlabhq/issues/8090.

See merge request !1196
 2014-10-20 12:44:07 +00:00
Dmitriy Zaporozhets 2064a14724 Add tests for remove group member feature in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 13:18:07 +03:00
Dmitriy Zaporozhets d4bc125581 Merge pull request #7856 from cirosantilli/error-to-msg 
Fix missing flash on file edit error from web UI.
 2014-10-20 12:52:17 +03:00
Ciro Santilli 9e1b97ad99 Use @project on controllers, don't call method 
Also memoize the method to ensure that other methods in
ApplicationController that rely on it can call it efficiently.
 2014-10-19 23:36:23 +02:00
Ciro Santilli 6a73b76c5f Remove param[:project_id] at admin controller 
The route never passes that parameter to the helpers.
 2014-10-19 23:02:19 +02:00
Ciro Santilli b011052ce7 Remove unused authenticate_user from project#show 
Redundant with the authorize_read_project! filter
 2014-10-19 11:46:57 +02:00
Ciro Santilli b66a152735 Factor abilities methods 
in app controller, user model and services.
 2014-10-19 11:12:39 +02:00
Dmitriy Zaporozhets b99eef4481 Merge branch 'ce_master' into 'master' 
CE master to EE master

See merge request !203
 2014-10-17 14:07:08 +00:00
Dmitriy Zaporozhets 966f68b33e Refactor error message a bit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-17 13:15:59 +03:00
Jan-Willem van der Meer d9bfebc0e8 Add regressiontest to verify allow_single_sign_on setting 
verification for #1677

Since testing omniauth_callback_controller.rb is very difficult, the logic
is moved to the models
 2014-10-16 20:08:30 +02:00
Dmitriy Zaporozhets 8fbc081d15 Merge branch 'ce_upstream' into 'master' 
CE upstream

See merge request !202
 2014-10-16 14:01:48 +00:00