home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,743 Commits 48 Branches 340 Tags
6eb944e52bbfe71ccdeae24da7f27ff4d559e288
Commit Graph
13743 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 6eb944e52b Merge branch 'rebase_on_merge_request' into 'master' 
Rebase on merge request

Introduces merge request option to rebase before merging.

Issue #185

See merge request !254
 2014-12-03 10:15:41 +00:00
Dmitriy Zaporozhets 2d20c1e249 Merge branch 'ui_improvements_for_events_table' into 'master' 
Ui improvements for events table

UI improvements as per comments by @dzaporozhets in https://dev.gitlab.org/gitlab/gitlab-ee/merge_requests/250

See merge request !256
 2014-12-02 16:22:06 +00:00
Marin Jankovski d1fa13d799 Merge branch 'ldapcachedoc' into 'master' 
Ldap cache and synchronization documentation

Fixes #180

/cc @jacobvosmaer @valery

See merge request !255
 2014-12-02 14:50:41 +00:00
Job van der Voort e713922bb7 improve ldap sync documentation 2014-12-02 10:16:03 +01:00
Marin Jankovski 27e75a1393 UI fixes for events table 2014-12-01 16:47:36 +01:00
Job van der Voort 8e4a7eb444 add documentation on LDAP synchronization in gitlab ee 2014-12-01 16:25:28 +01:00
Marin Jankovski 9714608ef6 Add rebase merge request documentation, add to changelog. 2014-12-01 09:40:56 +01:00
Marin Jankovski e4f5b6df0c Do a simpler rebase, show rebase check box only for users how can push code. 2014-11-28 16:48:03 +01:00
Marin Jankovski 267896c35e Add a spec for rebase option. 2014-11-28 13:23:04 +01:00
Marin Jankovski 7aaa8e8db2 Add comments around code to make it easier to understand, move remove_branch code into a separate method. 2014-11-28 11:29:11 +01:00
Marin Jankovski bd2a29a878 Add option of rebasing before merging. 2014-11-28 10:02:55 +01:00
Sytse Sijbrandij 26e9ca038d Merge branch 'doc/daily_ldap_check' into 'master' 
Add daily sync explanation from release blog post

See merge request !253
 2014-11-27 17:07:41 +00:00
Jacob Vosmaer 426e982f51 Add daily sync explanation from release blog post 2014-11-27 17:05:52 +01:00
Sytse Sijbrandij b8f0404b38 Upgrade link is redundant now that we have onboarding information. 2014-11-27 13:20:29 +01:00
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
Marin Jankovski 298ae61dac Add rebase merge request setting to project settings page. 2014-11-26 13:46:34 +01:00
Marin Jankovski df5b37376d Add merge request rebase enabled column to projects table. 2014-11-26 13:15:42 +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