Commit Graph
1930 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets e12c9ee2bc Added UsersGroup scaffold. Simplify adding people to group 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets 209f96bebe Use project.team over project.users 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets e940fbc7c1 Add UsersGroup relation to be respected by abilities and Project#team 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets 95965d3f54 Added UsersGroup validations. Added ability to add UsersGroup to group via UI 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets cc5440e82a Use navless layout for snippets page 2013-06-18 17:43:49 +03:00
Andrew Kumanyaev 26994b5d30 Remove unused, but slow code 2013-06-17 15:52:54 +04:00
Dmitriy Zaporozhets 6838304a85 Force user password change for users created by admin 2013-06-13 21:06:27 +03:00
Dmitriy Zaporozhets 00882b3c33 Prevent infinit password change by settin password_expires_at to nil 2013-06-13 20:21:51 +03:00
Dmitriy Zaporozhets 46231f0f1d Fix password set form and infinite loop 2013-06-13 20:16:48 +03:00
Dmitriy Zaporozhets fbf6989903 Force admin to change password after first sign-in 2013-06-13 20:06:33 +03:00
Dmitriy Zaporozhets 94be732026 Add password_expires_at to users table 2013-06-13 20:01:35 +03:00
Dmitriy Zaporozhets 5b40780290 Password expire: implement password resource inside profile. add before_fiter check 2013-06-13 19:53:04 +03:00
Dmitriy Zaporozhets 8f52501eb5 Fix inline diff issue. See #3150 2013-06-12 16:43:58 +03:00
Dmitriy Zaporozhets 993af5d0d2 cattr_accessor is not threadsafe! 2013-06-11 18:15:18 +03:00
Dmitriy Zaporozhets 159eee8dfd Merge pull request #4148 from jlgeering/secure-gravatar-urls
enforce secure gravatar urls when Gitlab.config.gitlab.https is set
2013-06-11 07:07:51 -07:00
Dmitriy Zaporozhets 9db06da4fa Merge pull request #4176 from Andrew8xx8/patch-2
500 error on showing not existed commit fixed
2013-06-11 06:44:18 -07:00
Dmitriy Zaporozhets 6eb045fc98 Prevent Project.all & User.all in selectboxes 2013-06-11 14:17:37 +03:00
Dmitriy Zaporozhets c38a6fe173 Group people management: replace selectbox with ajax one. 2013-06-11 13:51:22 +03:00
Dmitriy Zaporozhets 038d40f0f5 Solve inconsistency between network graph & stat graphs 2013-06-11 09:54:01 +03:00
Dmitriy Zaporozhets 7b5d68f0a7 Error page if forking fails 2013-06-10 21:40:23 +03:00
Dmitriy Zaporozhets f23d25bb4f Fix admin:group spinach. Remove selecting .all projects for admin user at teams page 2013-06-10 17:09:30 +03:00
Dmitriy Zaporozhets c5f56ee8a0 Restyle admin:group:show. Remove .all calls fro users, projects here 2013-06-10 15:58:51 +03:00
Dmitriy Zaporozhets 590c84c7a4 Fix determine of layout for group/team 2013-06-08 16:26:57 +03:00
Dmitriy Zaporozhets 6955c07597 navless layout for new group/team. Proper title for this pages 2013-06-07 17:41:01 +03:00
Dmitriy Zaporozhets 3c2b085b21 Use navless layout when it makes sense 2013-06-07 17:31:12 +03:00
Dmitriy Zaporozhets 68d146b4a6 Improve api docs 2013-06-06 13:19:23 +03:00
Dmitriy Zaporozhets 0fbaf95f13 Merge pull request #4155 from babatakao/selectable_master_project_deploy_keys
Selectable deploy keys contain master projects
2013-06-05 23:05:58 -07:00
Dmitriy Zaporozhets e7bcbb95c8 Restyle snippets 2013-06-05 22:25:27 +03:00
Dmitriy Zaporozhets f1e0d37b15 Its better to load graph with ajax since it requires ~10 seconds for bigger projects to finish up 2013-06-05 15:50:11 +03:00
Karlo Sorianoandkarlo57 71d67e6557 Contributors graphs feature for GitLab
Created tests and refactored some code along the way

Added stat graph util spec, refactored code

finsihed up tests and refactors

finsihed up tests and refactors
2013-06-05 16:51:48 +08:00
babatakaoandbaba 37a90d5f76 Selectable deploy keys contain master projects 2013-06-05 02:59:30 +09:00
Dmitriy Zaporozhets bcc4e4dc7e Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist
Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/project.rb
	app/views/snippets/_form.html.haml
	db/schema.rb
	features/steps/shared/paths.rb
	spec/factories.rb
	spec/models/project_spec.rb
2013-06-04 18:36:22 +03:00
Dmitriy Zaporozhets 50e8d6c0c0 Add api to collect owned user projects. Api deploy_key.create: Enable deploy key if it exist in other owned project 2013-06-03 19:49:04 +03:00
Andrew Kulakov a7de004481 500 error on showing not existed commit fixed 2013-06-03 19:04:41 +04:00
Jean-Luc Geering 57497e9f25 enforce secure gravatar urls when Gitlab.config.gitlab.https is set 2013-05-31 10:30:21 +02:00
Dmitriy Zaporozhets 6e5b1686f4 TeamManagement: Dont update permissions if it was not changed 2013-05-30 11:13:38 +03:00
Dmitriy Zaporozhets a52936f36a Renames resque resource to background_jobs 2013-05-30 09:46:28 +03:00
Peter LeFanu Lumsdaine 6b4602a733 Grammar fix in error message for blocked login (in "application_controller.rb") 2013-05-28 14:48:51 -03:00
Dmitriy Zaporozhets ec1055076c Merge branch 'add-defaults-create-group-team' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-add-defaults-create-group-team
Conflicts:
	config/gitlab.yml.example
2013-05-27 15:17:06 +03:00
Dmitriy Zaporozhets 233eb1c693 Rename repo feature 2013-05-25 00:07:19 +03:00
Dmitriy Zaporozhets 7cb86eb335 Dont allow LDAP users to change password inside GitLab 2013-05-24 17:12:27 +03:00
Dmitriy Zaporozhets ac952d0470 Campfire service added 2013-05-22 17:59:59 +03:00
Dmitriy Zaporozhets 3a22631dd3 Make service code more abstract 2013-05-22 16:58:44 +03:00
Dmitry Medvinsky 22279bc558 Add settings for user permission defaults
“Can create groups” and “Can create teams” had hardcoded defaults to
`true`. Sometimes it is desirable to prohibit these for newly created
users by default.
2013-05-16 18:02:22 +04:00
Dmitriy Zaporozhets 9e0246684d Files controller handle redirect to remote storage. Added config block to carrierwave init 2013-05-15 22:35:59 +03:00
Dmitriy Zaporozhets 9d9b78823d Fix paginate of blobs, fixed preserve in dev mode for blob results 2013-05-14 20:25:16 +03:00
Dmitriy Zaporozhets 46daf01a15 Search for blobs by default inside project. Added pagination for blobs search 2013-05-14 20:11:48 +03:00
Dmitriy Zaporozhets 634cbd7138 Refactor API classes. So api classes like Gitlab::Issues become API::Issues 2013-05-14 15:33:31 +03:00
Dmitriy Zaporozhets d32c19b2d9 Fix bulk issue status update 2013-05-14 14:34:34 +03:00
Dmitriy Zaporozhets c5feabde2d Add simple search to projects in public area 2013-05-13 21:18:08 +03:00