root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
18,287 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

478 Commits

Author SHA1 Message Date
Artem Sidorenko 10d2281d73 Show label on archived projects 2015-08-19 13:47:03 +02:00
Artem Sidorenko 3ebbed25f0 Allow listing of archived projects 
Resolves #9285
 2015-08-19 13:46:59 +02:00
Ben Bodenmiller 692e381e0c capitalize URL in "Home page URL" 2015-08-17 23:16:18 -07:00
Valery Sizov e58e75aa88 Fix: User search feature in admin area does not respect filters 2015-08-13 17:51:20 +03:00
Dmitriy Zaporozhets 4ba2698810
Remove selectbox from abuse form. Added pagination in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 15:13:47 +02:00
Dmitriy Zaporozhets 7a9d432cdb
Add abuse report management in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 15:08:22 +02:00
Stan Hu 0c1ccda43f Add "Confirm user" button in user admin page 
Closes #2116
Closes https://github.com/gitlabhq/gitlabhq/issues/9502
 2015-08-05 00:35:53 -07:00
Douwe Maan 45acfdd32a Disable adding members from admin area when appropriate 2015-07-28 16:36:48 +02:00
Douwe Maan 70a3c165a9 Allow custom label to be set for authentication providers. 2015-07-23 15:20:12 +02:00
Robert Speicher db8f4c0606 Add a button to Admin::Users#show to disable 2FA for that user 2015-07-10 17:18:33 -04:00
Dmitriy Zaporozhets 7081ab1e9e Merge branch 'add-unlock-access' into 'master' 
Add support for unlocking users in admin settings

### What does this MR do?

This MR gives the ability to unlock a user from the Admin panel.

### Why was this MR needed?

If a user fails to login a certain number of times, Devise locks the user out for a certain amount of time (e.g. 10 minutes). There is no way for an admin to unlock a user if this happens (aside from editing the `locked_at` field entirely).

### Screenshots

#### Admin index page

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/14c661d1d1f026770997b19af714c514/image.png)

#### Admin edit user page

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0c6f795757e5f03eeb923d818b7d6a96/image.png)

### What are the relevant issue numbers?

This replaces !288.

Closes https://github.com/gitlabhq/gitlabhq/issues/9381

See merge request !922
 2015-07-02 13:39:35 +00:00
Stan Hu 3e738e3b9a Add support for unlocking users in admin settings 
Closes https://github.com/gitlabhq/gitlabhq/issues/9381
 2015-07-02 04:22:51 -07:00
Stan Hu b643fa1603 Remove link leading to a 404 error in Deploy Keys page 
Closes #1866
 2015-07-01 22:53:52 -07:00
Robert Speicher 8384b577ef Remove duplicate 'required: true' attribute 2015-06-26 22:08:34 -04:00
Darby f0c4f0a5d4 Changed the placement of Restricted Domains 2015-06-23 15:54:33 -07:00
Darby 4cd3c33024 Updated the categories of Application Settings Form 2015-06-23 14:39:04 -07:00
Dmitriy Zaporozhets 8c6cbd4306 Merge branch 'master' into admin-edit-identities 2015-06-23 12:09:45 +02:00
Dmitriy Zaporozhets 7780a886e7
Set proper title when edit identity from admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-23 10:56:12 +02:00
Dmitriy Zaporozhets 1beb0dbe56
Fix admin identities code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-23 10:26:50 +02:00
Dmitriy Zaporozhets 7390b94db2
Fix code style issue 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 18:02:50 +02:00
Dmitriy Zaporozhets 73e003013f
Merge branch 'master' into admin-edit-identities 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/admin/users/show.html.haml
 2015-06-22 18:00:11 +02:00
Dmitriy Zaporozhets 3fe3cbf222
Fix indendity test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 17:52:22 +02:00
Dmitriy Zaporozhets cc04c5b828
Refactor admin user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 17:12:20 +02:00
Dmitriy Zaporozhets b21390936a
Make provider a select for identities form in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 16:53:11 +02:00
Dmitriy Zaporozhets 8f89a48847
Minor improvements to admin identities text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 16:52:06 +02:00
Robert Speicher 516b4c1248 Allow Admin to filter users by 2FA status 2015-06-19 16:35:53 -04:00
Robert Speicher 22dd2240a6 Add 2FA status to Admin::Users#show 2015-06-19 15:04:47 -04:00
Dmitriy Zaporozhets d059c69db7 Move identities list to own controller action 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 15:29:53 +02:00
Dmitriy Zaporozhets 270b7ce810 Add ability for admin to edit user identity 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 15:29:53 +02:00
Dmitriy Zaporozhets 228da2dd28 Admin can see and remove user identities 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 15:29:52 +02:00
Robert Speicher 7400cfc114 Bootlint: Use offset grid classes instead of empty divs 2015-06-16 13:32:32 -04:00
Douwe Maan 9ea8dcb5e2 Merge branch 'feature-session-expire-seconds-ui' into 'master' 
Add session expiration delay configuration through UI application

Setting is accessible by the administrator through the UI and defaults to 1 week (the current setting)

Answers the following suggestions:

  * http://feedback.gitlab.com/forums/176466-general/suggestions/6210719-make-session-length-configurable
  * http://feedback.gitlab.com/forums/176466-general/suggestions/6730512-automatic-logout-after-a-time-being-idle

See merge request !774
 2015-06-12 13:50:40 +00:00
themaze75 1d080f5745 session_expire_seconds => session_expire_delay 
delay is in seconds
more legible code in session_store
Added `GitLab restart required` help block to session_expire_delay
 2015-06-10 22:10:00 -04:00
Dmitriy Zaporozhets b637f84950
Fix broadcast message colors to one displayed in preview 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 20:39:02 +02:00
Dmitriy Zaporozhets 8641cda4a5
Dont use fixed pixel size if form controls - its bad for mobile devices 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 16:34:58 +02:00
Eric Maziade 84a414fe53 Add session expiration delay configuration through UI application 
settings
 2015-06-05 11:50:37 -04:00
Robert Speicher 793d9799b6 Show key fingerprint on DeployKeys#index 
Also style all key fingerprints consistently across the app.
 2015-06-03 18:03:04 -04:00
Robert Speicher 6e5473f930 Remove show actions from Admin and Project DeployKeys 2015-06-03 18:03:04 -04:00
Alex Lossent 60225a067d Allow to configure a URL to show after sign out 2015-05-29 18:20:15 +02:00
Douwe Maan 96d6fdc27c Add option to disallow users from registering any application to use GitLab as an OAuth provider 2015-05-29 13:29:16 +02:00
Dmitriy Zaporozhets 499154518a
You can not remove user if he/she is an only owner of group 
To prevent loose of group data you need to transfer or remove group
first before you can remove user

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-28 12:00:02 +02:00
Dmitriy Zaporozhets c3cf32e863
Merge branch 'version-check' into gl-version-check 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/admin/application_settings_controller.rb
	app/views/admin/application_settings/_form.html.haml
	db/schema.rb
 2015-05-08 16:05:00 +03:00
Stan Hu a1c6f7ce20 Improve help line for restricted domain signups 2015-05-05 19:46:37 -07:00
Stan Hu eb4f1eb5f5 Add application setting to restrict user signups to e-mail domains 
This feature was requested long ago:

http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains

This MR is based off !253 but changed to use application settings and use wildcard strings
to give more flexibility in pattern matching. Regexps seemed overkill and easy to get wrong.

Only restrict e-mail addresses upon creation
 2015-05-02 09:36:52 -07:00
Douwe Maan ae09c2a6db Capitalize "X" in "New X". 2015-04-30 21:33:02 +02:00
Douwe Maan 26ad250989 Add a page title to every page. 2015-04-30 19:12:15 +02:00
Dmitriy Zaporozhets 93359c7e06 Merge branch 'show-aside' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-show-aside 2015-04-30 19:40:05 +03:00
Dmitriy Zaporozhets 5bf9f69df7
Fix visibility settings UI in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-29 20:32:48 +03:00
Stan Hu 808b05e974 Move service template and project service settings into a shared view 2015-04-29 07:52:27 -07:00
Dmitriy Zaporozhets f21e269668
Fix adding new group members from admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-27 18:05:51 +03:00