home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,727 Commits 48 Branches 340 Tags
09f211ef4f032b7dfbc333754569896b34f0649f
Commit Graph
13727 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sytse Sijbrandij 09f211ef4f Merge branch 'subscriber_info' into 'master' 
Subscriber info

fixes part of https://dev.gitlab.org/gitlab/organization/issues/82

See merge request !252
 2014-11-27 12:18:43 +00:00
Marc Radulescu 6ca01fe2b3 clarify standard subscriber doc as source for emergency info 2014-11-27 12:51:17 +01:00
Marc Radulescu 080be2ad04 moved location of subscriber info for clarity 2014-11-26 18:19:41 +01:00
Marc Radulescu 821ebd3c28 added link for standard subscribers 2014-11-26 17:18:27 +01:00
Marc Radulescu c2260c5ce4 add subscriber info to EE repo 2014-11-26 17:04:33 +01:00
Jacob Vosmaer ba8e9facbf Merge branch 'git_hook_messages' into 'master' 
Better message for failed pushes because of git hooks

https://dev.gitlab.org/gitlab/gitlab-ee/issues/119

See merge request !242
 2014-11-25 13:03:36 +00:00
Jacob Vosmaer 04db866ead Merge branch 'audit_docs' into 'master' 
Audit event documentation

See merge request !251
 2014-11-25 13:03:09 +00:00
Marin Jankovski ec6692e180 Fix typo in documentation 2014-11-25 13:32:05 +01:00
Valery Sizov 8290e23e65 Git hook messages: Improved error description 2014-11-25 11:37:46 +00:00
Marin Jankovski 86aab4df5e Add audit events documentation. 2014-11-25 12:17:05 +01:00
Valery Sizov 5509a5e8d4 Git hook messages: wiki access fix 2014-11-24 16:25:58 +02:00
Valery Sizov 5e207e1164 bump gitlab-shell 2014-11-24 12:09:02 +00:00
Marin Jankovski 8bc7fab4f5 Add audit events to changelog. 2014-11-24 12:21:44 +01:00
Marin Jankovski 07925be296 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee 2014-11-24 11:41:27 +01:00
Valery Sizov ac614ea135 Merge branch 'audit_events' into 'master' 
Audit feature / permission changes in log

Audit events for membership changes of the group and project.

See merge request !250
 2014-11-24 09:46:58 +00:00
Marin Jankovski 4eaeb3b6d5 Factor audit events tests. 2014-11-24 09:01:01 +01:00
Marin Jankovski 4ff5c7c3f5 Merge branch 'fix/font-awesome' into 'master' 
Fix Enterprise Project Settings Icons

Font awesome was upgraded in CE and the corresponding enterprise project settings icons 'Groups' and 'Git Hooks' were not displaying any icon. The groups icon is exactly as it was pre-7.5. The git hooks icon is much different in the new font-awesome and did not make sense anymore. They do have a generic 'git' icon which I have included here and think looks nice.

## Pre-7.5:
![Screen Shot 2014-11-21 at 5.14.07 PM](https://gitlab.com/uploads/subscribers/gitlab-ee/12c3034fef/Screen_Shot_2014-11-21_at_5.14.07_PM.png)

## 7.5:
![Screen Shot 2014-11-21 at 5.14.24 PM](https://gitlab.com/uploads/subscribers/gitlab-ee/4f97728c19/Screen_Shot_2014-11-21_at_5.14.24_PM.png)

## After this merge request:
![Screen Shot 2014-11-21 at 5.14.17 PM](https://gitlab.com/uploads/subscribers/gitlab-ee/09b06bfddc/Screen_Shot_2014-11-21_at_5.14.17_PM.png)

See merge request !24
 2014-11-22 07:21:54 +00:00
Drew Blessing c65e4f9449 Fix icons for enterprise project settings 2014-11-21 17:12:55 -06:00
Jacob Vosmaer 991204eafd Merge branch 'packages-for-7-5' into 'master' 
New packages links for 7.5

Added packages for the latest GitLab Version 7.5.1

See merge request !249
 2014-11-21 17:52:19 +00:00
Patricio Cano c9d4d1eec6 Fixed Ubuntu 12.04 link 2014-11-21 17:49:58 +00:00
Patricio Cano 43d17305d8 Added packages for version 7.5.1 2014-11-21 17:42:09 +00:00
Marin Jankovski 6bcb1a033f Add removal and addition of the user to the group membership to audit events. 2014-11-21 16:51:06 +01:00
Marin Jankovski 4713fbd239 Add removal and addition of the user to the project membership to audit events. 2014-11-21 16:08:12 +01:00
Marin Jankovski 8f1190f7c7 Use hash instead of json. 2014-11-21 15:58:21 +01:00
Marin Jankovski b68e1123fb Move event creation to service. 2014-11-21 12:32:12 +01:00
Marin Jankovski e3d96fc2da Remove table duplication. 2014-11-21 11:28:25 +01:00
Sytse Sijbrandij a4b288d737 Add installation instructions. 2014-11-20 21:46:51 +00:00
Marin Jankovski ac9f9ae1c7 Add audit even feature spec for groups. 2014-11-20 22:24:34 +01:00
Jacob Vosmaer a942594c1c Merge branch 'packages/7.4.5-ee' into 'master' 
Add 7.4.5-ee packages

See merge request !248
 2014-11-20 12:52:03 +00:00
Jacob Vosmaer 98458197eb Add 7.4.5-ee packages 2014-11-20 12:10:53 +01:00
Marin Jankovski f90db27e2a Add audit events feature spec for project. 2014-11-20 11:54:05 +01:00
Marin Jankovski e348c6512f Add group audit events. 2014-11-20 08:54:49 +01:00
Marin Jankovski 2d1b88c1a0 Paginate audit events page and add time column. 2014-11-19 16:32:49 +01:00
Marin Jankovski 4734c3a797 Create an audit events overview on the project settings page. 2014-11-19 16:18:30 +01:00
Marin Jankovski bcaf86da60 Add a route to project audit_events. 2014-11-19 16:16:46 +01:00
Marin Jankovski b722baeec1 Audit and Security event models. 2014-11-19 16:07:15 +01:00
Patricio Cano 35b87298ac Merge branch 'typo-fix-in-doc' into 'master' 
Fix typo in documentation

Fixed a typo in a link to a configuration sample that was pointing to a non-existing page.

See merge request !245
 2014-11-18 21:15:00 +00:00
Patricio Cano c2a04705d6 Fixed typo in link to config sample. 2014-11-18 16:13:03 -05:00
Marin Jankovski cf6b622686 Add audit event table. 2014-11-18 16:51:05 +01:00
Jacob Vosmaer c22d314547 Merge branch '7-5-update-doc' into 'master' 
Updated documentation for 7.5 release

Documentation for 7.5 release has been updated. Changes include:

- Pointed Ruby version in guides to 2.1.5
- Pointed gitlab-shell version in guides to 2.2.0
- Links to configuration samples for EE files point to the Subscribers' EE repo

See merge request !244
 2014-11-18 09:49:33 +00:00
Patricio Cano 7d29327381 Point gitlab-shell config example to v2.2.0 tag 2014-11-17 16:39:16 -05:00
Patricio Cano 27fc388e96 Renamed main update file to ...7.5.md, updated links and versions (Ruby to 2.1.5 and gitlab-shell to 2.2.0). 
Corrected ruby download link.
 2014-11-17 16:23:51 -05:00
Patricio Cano 0b1bac132e Added new update guides for latest version 7.5 2014-11-17 16:21:40 -05:00
Jacob Vosmaer 11b3a05946 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-11-17 15:41:52 +01:00
Valery Sizov e2c14a2b4c Merge branch 'small_improvements' into 'master' 
Improved git hook description

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

See merge request !243
 2014-11-17 14:35:54 +00:00
Valery Sizov 5ab3adb432 Improve git hook description 2014-11-17 13:52:34 +02:00
Valery Sizov 30ac909f30 Merge branch 'update_changelog_' into 'master' 
Update changelog

See merge request !1258
 2014-11-17 11:04:15 +00:00
Valery Sizov 214f6985a8 Update changelog 2014-11-17 11:03:03 +00:00
Valery Sizov 3058059c0a Better message for failed pushes because of git hooks 2014-11-17 12:34:37 +02:00
Dmitriy Zaporozhets 75c3dc9efc Merge branch 'sidekiq_gc_start' into 'master' 
Run 'GC.start' after every EmailsOnPushWorker job

This change removed a lot of large peaks of the Sidekiq memory growth graph on gitlab.com.

See merge request !1257
 2014-11-14 14:48:30 +00:00