home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,878 Commits 48 Branches 340 Tags
baef6728fa4e8e515ccdeba1ea54da996f322aab
Commit Graph
344 Commits
Author SHA1 Message Date
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
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
Yatish MehtaandRémy Coutable 6ac68d8cb0 Remove instance variable @group multiple assignment 2016-03-08 16:48:00 +01:00
Zeger-Jan van de Weg 9a2869ab46 Branded login page also in CE 
The only major difference with the EE version is the change from a light and dark logo to only a header logo
The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
 2016-02-26 15:50:51 +01:00
Tap 2e81b1558b Label description and Label row 
- Add label description
- Show label row when filtering issues or merge requests by label
 2016-02-17 21:52:12 +08:00
Jason LeeandRémy Coutable 9474e36f46 Add option to include the sender name in body of Notify email. fix #7824 2016-02-09 12:58:13 +01:00
Robert Speicher 89b3ddd609 Allow limited Markdown in Broadcast Messages 
Closes #11853
 2016-02-06 14:30:07 -05:00
Dmitriy Zaporozhets 989caaebdc Improve admin broadcast messages page 
* Show latest broadcast messages first on admin page
* Use nice looking pagination

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-05 16:01:10 +01:00
Douglas Barbosa Alexandre 718b1dddfe Refactor Admin::SpamLogsController to block user before destroying 2016-02-02 11:25:44 -02:00
Stan HuandDouglas Barbosa Alexandre d20e75a8d8 Support Akismet spam checking for creation of issues via API 
Currently any spam detected by Akismet by non-members via API will be logged
in a separate table in the admin page.

Closes #5612
 2016-02-02 11:25:44 -02:00
Robert Speicher ca05054ea2 Partially revert "Add IP check against DNSBLs at account sign-up" 
This partially reverts 6a5cd3ca - we keep the migration and add a new
migration that reverts it in order to keep migration history intact.
 2016-01-28 16:28:19 -05:00
Robert Speicher 1553c560e0 Merge branch 'feature/check-against-rbl-only' into 'master' 
Split from !2455

References #9092

See merge request !2515
 2016-01-20 14:24:20 -05:00
Tomasz Maczukin 8536e083f7 Add IP blocking against DNSBL at sign-up 2016-01-20 15:28:19 +01:00
Jeroen Nijhof 85e0fce9ee Add sentry integration 2016-01-18 17:15:10 +01:00
Douwe Maan 4d64a32c88 Merge branch 'feature/ldap-sync-edgecases' into 'master' 
LDAP Sync blocked user edgecases

Allow GitLab admins to block otherwise valid GitLab LDAP users
(https://gitlab.com/gitlab-org/gitlab-ce/issues/3462)

Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other.

Expected behavior:

- [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?`
- [x] "ldap_blocked" users can't be unblocked by the Admin UI
- [x] "ldap_blocked" users can't be unblocked by the API
- [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked"
- [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization
- [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked`
 
Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users:
![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png)

There will be another MR for the EE version.

See merge request !2242
 2016-01-14 11:00:08 +00:00
Robert Speicher 00e8700433 Broadcast Messages can now be edited 
Closes #3046
 2016-01-13 11:42:15 -05:00
Robert Speicher 6ae39c2cd1 Remove alert_type attribute from BroadcastMessage 2016-01-13 11:34:57 -05:00
Yorick Peterse b7f49aa0f0 Merge branch 'configure-randomize-metrics-sample-interval' into 'master' 
See merge request !2406
 2016-01-13 14:54:45 +00:00
Yorick Peterse 2367160015 Make the metrics sampler interval configurable 2016-01-13 12:29:48 +01:00
Robert Speicher da40274fdc Block the reported user before destroying the record 
This is intended to prevent the user from creating new objects while the
transaction that removes them is being run, resulting in objects with
nil authors which can then not be edited.

See https://gitlab.com/gitlab-org/gitlab-ce/issues/7117
 2016-01-12 20:59:55 -05:00
Gabriel Mazetto 47e4613f4a Code style fixes and some code simplified 2016-01-08 16:26:04 -02:00