home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,943 Commits 48 Branches 340 Tags
54aa0969d40549014bee6e4e500276405fb055ee
Commit Graph
601 Commits
Author SHA1 Message Date
Robert Speicher 7ea60fbfc8 Merge remote-tracking branch 'dev/master' into 'master' 2016-02-09 12:13:58 -05: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
Kamil Trzcinski 0806476761 Remove current_user && when can? is used 2016-02-05 20:17:58 +01:00
Kamil Trzcinski 170ca8435a Merge branch 'master' into ci-permissions 
# Conflicts:
#	db/schema.rb
 2016-02-05 20:15:32 +01: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
Dmitriy Zaporozhets eaad236b45 Remove project-issuable-filter from admin builds page :) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-05 11:53:06 +01:00
Dmitriy Zaporozhets dfe12649f6 Merge remote-tracking branch 'origin/rs-database-info' 2016-02-04 16:42:22 +01:00
Kamil Trzcinski 6fea7c386f Merge remote-tracking branch 'origin/master' into ci-permissions 
# Conflicts:
#	app/views/projects/builds/index.html.haml
 2016-02-04 13:16:48 +01:00
Robert Speicher 4105f292e1 Display database type and version in Administration dashboard 
Closes #12900
 2016-02-02 17:59:09 -05:00
Douglas Barbosa Alexandre 718b1dddfe Refactor Admin::SpamLogsController to block user before destroying 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre 62cad887ea Use time_ago_with_tooltip on spam logs list 2016-02-02 11:25:44 -02:00
Douglas Barbosa Alexandre 64c9768bd6 Use truncate helper on spam logs list 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
Kamil Trzcinski 055afab5c7 Make the CI permission model simpler 
This MR simplifies CI permission model:
- read_build: allows to read a list of builds, artifacts and trace
- update_build: allows to cancel and retry builds
- create_build: allows to create builds from gitlab-ci.yml (not yet implemented)
- admin_build: allows to manage triggers, runners and variables
- read_commit_status: allows to read a list of commit statuses (including the overall of builds)
- create_commit_status: allows to create a new commit status using API

Remove all extra methods to manage permission.
Made all controllers to use explicitly the new permissions.
 2016-02-02 09:18:08 +01:00
Robert Speicher 3986f4f083 Make "Two-factor" casing consistent throughout the application 2016-01-31 20:34:51 -05: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
Phil Hughes 22e81f5dbe Removed sorted text from dropdowns 
Closes #12796
 2016-01-28 09:06:20 +00:00
Dmitriy Zaporozhets 48b6b0a446 Merge branch 'rs-issue-12672' into 'master' 
Remove link from system hook

Closes #12672

See merge request !2588
 2016-01-27 18:45:51 +00:00
Zeger-Jan van de Weg c10296f92d Fix visibility level texts on application settings 
Introduced by me through !2005
 2016-01-26 14:54:35 +01:00
Zeger-Jan van de Weg 89154880e5 Save button on app settings now btn-save 2016-01-26 10:05:28 +01:00
Robert Speicher 0ae588255c Remove link from system hook 
Closes #12672
 2016-01-24 15:27:50 -08:00
Dmitriy Zaporozhets cf673ba9f6 Fix UI for pages with panels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-22 13:37:40 -08: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
Douwe Maan 7838c957c2 Target '_blank' 2016-01-20 16:18:42 +01:00
Tomasz Maczukin 8536e083f7 Add IP blocking against DNSBL at sign-up 2016-01-20 15:28:19 +01:00
Jeroen Nijhof 7a609858f0 Use sentry in env production only 2016-01-20 09:48:38 +01:00
Jeroen Nijhof 85e0fce9ee Add sentry integration 2016-01-18 17:15:10 +01:00
Dmitriy Zaporozhets 620d8b68a1 Merge branch 'remove-gray-bg' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-14 14:09:49 +01:00
Grzegorz Bizon 487b0a026f Improvements, readability for artifacts browser 2016-01-14 12:48:16 +01:00
Grzegorz Bizon 8eeed761a9 Update specs for CI Build, add artifacts? method 
`artifacts?` method checks if artifacts archive is available.
 2016-01-14 12:48:14 +01:00
Grzegorz Bizon 9e0e9342a4 Rename method that returns url to CI build artifacts download 2016-01-14 12:48:14 +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
Gabriel Mazetto fc7e6e8ffc Fix Admin/Users view to position buttons without spacing magic 2016-01-14 03:08:40 -02:00
Robert Speicher 55d0323961 Remove (invalid) timestamp formatting 2016-01-13 12:01:58 -05:00
Robert Speicher 843662821d Move BroadcastMessage#status to a helper since it's presentational 2016-01-13 11:49:59 -05:00
Robert Speicher 00e8700433 Broadcast Messages can now be edited 
Closes #3046
 2016-01-13 11:42:15 -05:00
Robert Speicher 7e24c5c45a Move broadcast message form to a partial 2016-01-13 11:34:19 -05:00
Robert Speicher 1c7febc3e3 Style the broadcast message form 2016-01-13 11:34:19 -05:00
Robert Speicher 79361b207e Add js-requires-input to form 2016-01-13 11:34:19 -05:00
Dmitriy Zaporozhets f956514b10 Dont use nav-pills. Instead use nav-lists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-13 17:26:45 +01:00
Dmitriy Zaporozhets 3238b0bc9f Replace nav-tabs with nav-links 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-13 17:13:36 +01:00
Dmitriy Zaporozhets 03090a88d8 Replace all navigation menu with nav-links class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-13 15:58:04 +01: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
Jacob Schatz f225c2a005 Merge branch 'improve_more_buttons' into 'master' 
Improve admin area button style

A lot of the buttons in the top right in the admin area were too big. This makes those the new `btn-nr` size which seems to look nice.

## User buttons

### Current

![Screen_Shot_2016-01-08_at_2.29.30_PM](/uploads/8920d4a67ff4a20617e5b4d319ba154e/Screen_Shot_2016-01-08_at_2.29.30_PM.png)

### New

![Screen_Shot_2016-01-08_at_2.29.21_PM](/uploads/494741f6e92592ff2c60683f399bb1c1/Screen_Shot_2016-01-08_at_2.29.21_PM.png)

## Project edit button

### Current

![Screen_Shot_2016-01-08_at_2.29.59_PM](/uploads/09a2f8fddc45120510dd10758ce33c51/Screen_Shot_2016-01-08_at_2.29.59_PM.png)

### New ![Screen_Shot_2016-01-08_at_2.30.14_PM](/uploads/93a72a7c42b1974643b1e9ffd3ec8511/Screen_Shot_2016-01-08_at_2.30.14_PM.png)

## Label button

### Current

![Screen_Shot_2016-01-08_at_2.38.09_PM](/uploads/9cff790e1a4e2d650487c9765d0235a4/Screen_Shot_2016-01-08_at_2.38.09_PM.png)

### New

![Screen_Shot_2016-01-08_at_2.38.31_PM](/uploads/9462ff2393249eb762dc7cb92605c733/Screen_Shot_2016-01-08_at_2.38.31_PM.png)

cc/ @jschatz1 @creamzy @skyruler 

See merge request !2351
 2016-01-12 17:36:01 +00:00
Stan Hu 75123458ee Add user's last used IP addresses to admin page 
This would help admins figure out from where spam is originating.
 2016-01-12 00:59:29 -08:00
Drew Blessing 97022c414e Improve admin area button style 2016-01-11 09:11:40 -06:00
Stan Hu 5f6b093445 Disable "Already Blocked" button in admin abuse report page 2016-01-09 21:25:18 -08:00
Robert Speicher 00a68c3cb0 Remove Block Button from Abuse Reports page if User is Already Blocked 
An addition to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2292

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/4667

See merge request !2313
 2016-01-08 22:02:34 +00:00