home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,694 Commits 48 Branches 340 Tags
f90db27e2a85f8a2004bb8155aa149cbe0e4a90d
Commit Graph
13694 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Dmitriy Zaporozhets 66f0c27971 Merge branch 'update-gitlab-git' into 'master' 
Update gitlab_git to 7.0.0.rc11

See merge request !1256
 2014-11-14 14:47:08 +00:00
Dmitriy Zaporozhets e53f9b4d69 Merge branch 'gitlab.com-packages' into 'master' 
Gitlab.com uses special packages, build them first

See merge request !1255
 2014-11-14 14:25:41 +00:00
Dmitriy Zaporozhets a69249d9de Merge branch 'author_attributes_clean' into 'master' 
Author attributes clean

See merge request !1254
 2014-11-14 14:10:03 +00:00
Dmitriy Zaporozhets 7e3f49bab0 Merge branch 'branch_name' into 'master' 
Strip tags from branch name

See merge request !1251
 2014-11-14 14:09:29 +00:00
Jacob Vosmaer c10f61802b Run 'GC.start' after every EmailsOnPushWorker job 2014-11-14 12:22:22 +01:00
Jacob Vosmaer a9dc2c2029 Update gitlab_git to 7.0.0.rc11 2014-11-14 12:14:17 +01:00
Dmitriy Zaporozhets d55f5587aa Merge branch 'update-changelog' into 'master' 
Update changelog

See merge request !1252
 2014-11-14 10:53:59 +00:00
Jacob Vosmaer de3bef058e Gitlab.com uses special packages, build them first 2014-11-14 11:47:08 +01:00
Marin Jankovski ced2438312 Clean the string with commit author and email. 2014-11-14 11:08:58 +01:00
Valery Sizov 5d7595eff9 Merge branch 'update_changelog' into 'master' 
Update changelog

See merge request !240
 2014-11-13 17:37:18 +00:00
Valery Sizov ddf2f82f4b update changelog 2014-11-13 17:36:40 +00:00
Dmitriy Zaporozhets 5e9f6562bb Update CHANGELOG for 7.5 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-13 19:20:35 +02:00
Valery Sizov a0b393a32a Merge branch 'update_changelog' into 'master' 
Update EE changelog

See merge request !239
 2014-11-13 16:20:57 +00:00
Valery Sizov 9ae648f20a Update EE changelog 2014-11-13 18:20:02 +02:00
Jacob Vosmaer 48d90d54fe Merge branch 'ce_master_non_conflict' into 'master' 
CE master to EE master

See merge request !238
 2014-11-13 16:05:54 +00:00
Marin Jankovski 334fe86574 Sanitize branch name and ref name 2014-11-13 16:20:43 +01:00
Marin Jankovski 9eb571f0ea Add branch controller test. 2014-11-13 16:19:07 +01:00
Valery Sizov c7ee816d0e fix after merging conflicts 2014-11-13 17:11:27 +02:00
Valery Sizov 3fcd75a911 Merge CE master into EE master 
Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb
 2014-11-13 17:05:12 +02:00
Jacob Vosmaer 4e65d085b5 Merge pull request #8299 from dandric-activevideo/bug8271 
Fix for #8271: Correctly restore empty repositories.
 2014-11-13 15:34:51 +01:00
Dimitry Andric 4a5044e302 Correctly restore empty repositories. 
If a project is being restored, but there is no bundle file, the project was
empty when it was backed up.  In this case, just use git init --base to create a
new bare repository.
 2014-11-13 13:09:47 +01:00
Dmitriy Zaporozhets 6adc313a1f Merge branch 'actions_in_the_inbox' into 'master' 
Actions in the inbox

Related to #1607

See merge request !1247
 2014-11-12 14:57:38 +00:00
Dmitriy Zaporozhets 3bd12e992b Merge branch 'requirements_update' into 'master' 
RAM Requirements update

512MB of RAM is not enough to install using omnibus-gitlab.

Installation will fail in very random places.

Manual installation might also fail with this low amount of RAM.

See merge request !1249
 2014-11-12 14:44:26 +00:00
Dmitriy Zaporozhets b952b890b4 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-11-12 16:35:38 +02:00
Dmitriy Zaporozhets 3898c8c21c Merge branch 'performance-improvements' into 'master' 
Performance improvements

Push 1k commits cause 1k sql queries to collect commit author. But this variable was used only in 20 commits (from 1000).
So we did 980 sql queries without using it. This MR fixes it.

See merge request !1250
 2014-11-12 14:10:07 +00:00
Jacob Vosmaer dfcc59a92b Merge pull request #8291 from MrMarvin/fix/ldap_cleanup_task 
fixes the `block_removed_ldap_users` rake task
 2014-11-12 13:40:36 +01:00
Dmitriy Zaporozhets 722d80739b Prevent big amount of sql queries for push service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-12 13:59:25 +02:00
Marin Jankovski 5cf6d5949d Remove the lowest memory requirement of 512MB. 2014-11-12 12:54:43 +01:00
Dmitriy Zaporozhets 53f05343f5 Merge pull request #8276 from dblessing/docs/custom_hooks 
Custom git hook documentation
 2014-11-12 13:23:59 +02:00
Dmitriy Zaporozhets 9a96a8270b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-11-12 13:20:01 +02:00
Dmitriy Zaporozhets 940ed58e76 Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into jeroenj/gitlab-ce-commit-comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-11-12 13:19:35 +02:00
Valery Sizov 31d9864ad4 Merge branch 'backup_restore_drop_sequences' into 'master' 
Drop all Postgres sequences during backup restore

See merge request !1226
 2014-11-12 11:15:10 +00:00
Valery Sizov 1a7e347635 Merge remote-tracking branch 'origin/master' into backup_restore_drop_sequences 
Conflicts:
	CHANGELOG
 2014-11-12 13:14:13 +02:00