home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,355 Commits 48 Branches 340 Tags
f036d4095e5700a1663ce3429b0342fa813c3c7a
Commit Graph
500 Commits
Author SHA1 Message Date
Diogo Resende bbb845b20b Adds newline at end of file 2015-09-30 17:28:06 +00:00
Diogo Resende 63a6259328 Adds missing plural form of applications of previous commit 2015-09-30 17:26:55 +00:00
Diogo Resende e471356f76 Fixes english information paragraph in admin/applications view 2015-09-30 08:34:00 +00:00
Douwe Maan 1c1c7e1abd Merge branch 'fxposter/gitlab-ce-login-from-admin' 2015-09-28 15:43:02 +02:00
Aaron Snyder a9cfa6c508 Fix grammar in admin area labels .nothing-here-block when no labels exist. 
updating admin area > "Labels" text to "There are no labels yet.", per Stan Hus suggestion.
 2015-09-26 11:25:26 -07:00
Pavel Forkert 82eeb5e284 Remove stuff from previous UI 2015-09-24 16:38:52 +03:00
Pavel Forkert eb9528b8b9 Move login button to user page, switched to POST method 2015-09-24 16:34:04 +03:00
Pavel Forkert 83347954fc Add option to admin area to sign in as a specific user 
Closes #2291
 2015-09-24 16:14:16 +03:00
Hannes Rosenögger 3a4c5986fb clarify confirmation text on user deletion. 2015-09-21 22:05:13 +02:00
Douwe Maan 0c83349867 Merge branch 'master' into rename-reply-by-email 2015-09-21 10:35:56 +02:00
Douwe Maan ee028d9d60 Rename reply_by_email to incoming_email to prepare for the future. 2015-09-21 10:35:37 +02:00
Kamil Trzcinski b2a9021685 Change wording 2015-09-21 00:42:25 +02:00
Kamil Trzcinski e41a29b0c3 Allow to disable GitLab CI 2015-09-18 12:46:47 +02:00
Jeroen van Baarsen fe17a236e3 Allow custom info to be added to Help page 
Fixes #2536

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-09-18 10:15:40 +02:00
Valery Sizov 57d0013090 CRUD for admin labels 2015-09-03 15:50:23 +03:00
Dmitriy Zaporozhets ef0149dd44 Merge branch 'enable_ssl_verification_web_hook' into 'master' 
Enable SSL verification for Webhooks

https://dev.gitlab.org/gitlab/gitlabhq/issues/2121

See merge request !1135
 2015-08-26 16:06:02 +00:00
Valery Sizov bafffb2d14 Enable SSL verification for Webhooks 2015-08-26 15:48:31 +03:00
Dmitriy Zaporozhets 13f8fc9784 Fix remove report button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-25 10:57:56 +02:00
Dmitriy Zaporozhets e02b7bf443 Improve abuse reports management 
* Link to user profile instead of user admin page
* One button for remove user and report
* Remove user and report with page reloading

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-25 10:52:10 +02:00
Douwe Maan 3d51a6d435 Merge branch 'master' into reply-by-email 2015-08-20 12:19:19 -07:00
Artem Sidorenko 55dca86b98 Import sources: settings in the admin interface 2015-08-20 11:28:27 +02:00
Douwe Maan 089aa2de2b Add Reply by email feature to admin dashboard. 2015-08-19 13:57:27 -07:00
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