home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
29,470 Commits 48 Branches 340 Tags
a0adafddd0ce40c4ce9f052d2ee5e8ea38a2fb58
Commit Graph
363 Commits
Author SHA1 Message Date
Kamil Trzcinski 846d111f1d Add Application Setting to configure Container Registry token expire delay (default 5min) 2016-05-31 13:23:13 +02:00
Grzegorz Bizon 4cc77c3bf8 Minor runner-related code refactorings 2016-05-19 22:01:53 +02:00
Grzegorz Bizon 52ba3a2d05 Display validation errors when admin edits a runner 2016-05-19 22:01:53 +02:00
Dmitriy Zaporozhets 253a017b01 Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-18 12:48:23 -05:00
Douwe Maan 8b15628dd0 Merge branch 'issue_14684' into 'master' 
Toggle email signup confirmation in admin settings

Implements toggling verification email #14684

See merge request !3862
 2016-05-16 21:05:05 +00:00
Felipe Artur c5526a2d9a Change skip_user_confirmation_email to send_user_confirmation_email 2016-05-16 14:56:32 -03:00
Felipe Artur 71ca2de7aa Toggle email signup confirmation in admin settings 2016-05-16 14:56:32 -03:00
Sean McGivern bec350528c Force password change after admin reset 
When an admin changes a user's password for them, force the user to
reset the password after logging in by expiring the new password
immediately.
 2016-05-16 09:21:24 +01:00
Douwe Maan 7fc51d1908 Merge branch 'health-check-route' 
# Conflicts:
#	db/schema.rb
 2016-05-12 16:39:03 -05:00
Douwe Maan 74c69709dc Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources' 2016-05-12 15:11:37 -05:00
DJ Mountney ad77ab0376 Add Changelog entry 
and drop exception handling around HealthCheck::Utils.process_checks, it wasn't needed
 2016-05-12 09:04:04 -07:00
Andrei Gliga b17cca1d94 delete the enabled_oauth_sign_in_sources after getting it's value into enabled_oauth_sign_in_sources 
just delete enabled_oauth_sign_in_sources and get it's value
 2016-05-12 13:44:46 +03:00
Andrei Gliga ab7f9c9ae1 Array(enabled_oauth_sign_in_sources) instead of the if 2016-05-12 13:44:46 +03:00
Andrei Gliga 9bfa74fcfe enabled_oauth_sign_in_sources param doesn't need permit 2016-05-12 13:44:46 +03:00
Andrei Gliga 7818f7329a On Application Settings Page let the user select the enabled OAuth Sign in sources instead of the disabled ones 2016-05-12 13:44:46 +03:00
Andrei Gliga e5ddd6d21e disabled_oauth_sign_in_sources parameter handling in ApplicationSettingsController 2016-05-12 13:44:46 +03:00
DJ Mountney 160ef66d1b Add health_check access token, and enforce on the health_check endpoint 
Also added a health check page to the admin section for resetting the token.
 2016-05-10 08:46:02 -07:00
Grzegorz Bizon 7d6d3421d6 Share form editable attributes mf runner via model 2016-05-10 14:21:01 +02:00
Stan Hu 731b231357 Log to application.log when an admin starts and stops impersonating a user 
Closes gitlab-org/gitlab-ee#536
 2016-05-04 09:21:34 -07:00
Robert Speicher c9bc3d20ef Merge remote-tracking branch 'dev/master' into 'master' 2016-05-02 19:58:54 -04:00
Gabriel Mazetto 00ced598ea Added UI to define secret_token for webhook and systemhook 
Codestyle changes to easy EE merge
 2016-05-02 10:32:01 -03:00
Douwe Maan c6c985bc69 Store original user in variable 2016-04-22 21:58:09 +00:00
Douwe Maan 0ab98a8a40 Remove unused method 2016-04-22 21:55:49 +00:00
Douwe Maan d3462e711c Fix issue with impersonation 2016-04-22 23:21:56 +02:00
Yorick Peterse 229f3ce9ce Configuring of points per UDP packet 
This allows users to configure the number of points stored in a single
UDP packet. This in turn can be used to reduce the number of UDP packets
being sent at the cost of these packets being somewhat larger.

The default setting is 1 point per packet so nothing changes for
existing users.
 2016-04-19 14:35:25 +02:00
Kamil Trzciński ee812a8707 Merge branch 'configurable-shared-runners-text' into 'master' 
Add configurable shared runners text

cc @axil @rspeicher @grzesiek 

See merge request !3750
 2016-04-19 12:15:59 +00:00
Dmitriy Zaporozhets 45525edd5b Add push events to permit params in system hooks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-19 11:42:39 +02:00
Kamil Trzcinski 6b124d42d9 Add configurable shared runners text 2016-04-18 09:54:52 -04:00
Jacob Vosmaer 0f602be99f Clear repository check columns asynchronously 2016-04-13 15:56:05 +02:00
Jacob Vosmaer 3170e5d226 Basta 2016-04-12 18:09:45 +02:00
Jacob Vosmaer 7b1bb0f4db Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck 2016-04-12 17:44:02 +02:00
Jacob Vosmaer ea787165b3 Move 'clear checks' button to applicatoin settings 2016-04-12 17:32:58 +02:00
PotHix 222e1dc59c Fixes #14638. 
The SQL query was ambiguous and in this case we want to filter projects.
 2016-04-06 13:56:28 -03:00
Jacob Vosmaer 5cf56e5647 Rename almost all the things 2016-04-06 13:47:05 +02:00
Jacob Vosmaer bf9526739b Rebase repo check MR 2016-04-04 17:23:43 +02:00
connorshea 85cc172959 Remove "Congratulations!" tweet button on newly-created project. 
I’ve removed everything related to the feature based on this commit:
ce08f919f34fd8849834365

Resolves #10857.
 2016-03-31 17:09:36 -06:00
Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 
# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb
 2016-03-21 23:22:21 +01:00
Felipe Artur 8d544645f0 Add specs and add visibility level to admin groups 2016-03-21 19:11:24 -03:00
Douwe Maan 7c51d5efec Fix some specs 2016-03-20 22:55:08 +01:00
Douwe Maan 2eb19ea3ea Merge branch 'master' into issue_12658 2016-03-20 14:57:25 +01:00
Robert Speicher 085538c2bd Use the configured Kaminari "per page" default 2016-03-19 17:37:54 -04:00
Douwe Maan 21af7459ab Merge branch '4009-external-users' into 'master' 
External Users

The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.

Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users)


![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png)

See merge request !3171
 2016-03-17 14:15:38 +00:00
Felipe Artur 44c127447b Merge 4009-external-users into issue_12658 2016-03-16 20:16:42 -03:00
Mehmet Emin İNAÇ 6a0ea605e8 Change deprecated usage of rendering without response body 
`render nothing: true` has been deprecated.
For more information see [pr](https://github.com/rails/rails/pull/20336)
 2016-03-16 03:16:25 +02:00
Zeger-Jan van de Weg 8077a5f958 Clearify who deletes the user 2016-03-15 21:09:25 +01:00
Zeger-Jan van de Weg a09323c9f5 Fix broken specs 2016-03-15 21:09:25 +01:00
Zeger-Jan van de Weg b221d11a25 Add ability to delete a user with force 2016-03-15 21:09:25 +01:00
Zeger-Jan van de Weg 4bcc097750 A worker deletes a user, so the request doesn't time out 
Fixes #13261
 2016-03-15 21:09:25 +01:00
Zeger-Jan van de Weg 42fcd3881f External Users 
The user has the rights of a public user execpt it can never create a project,
 group, or team. Also it cant view internal projects.
 2016-03-13 19:08:04 +01:00
Felipe Artur c3e70280df Prevent projects to have higher visibility than groups 
Prevent Groups to have smaller visibility than projects
Add default_group_visibility_level to configuration
Code improvements
 2016-03-10 10:38:36 -03:00