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
12,715 Commits 48 Branches 340 Tags
3ff2ea4c1cbd7175fa45f3c4287d0196429fb2d6
Commit Graph
12715 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Vosmaer 3ff2ea4c1c Update CHANGELOG for 7.5.3 2014-12-05 11:20:18 +01:00
Jacob Vosmaer 705b324aea Revert "Update Sidekiq to 2.17.8" 
This reverts commit 91ee82c54f.
 2014-12-05 11:19:23 +01:00
Dmitriy ZaporozhetsandJacob Vosmaer e96a5dd013 Bump gitlab_git with new rugged 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 18:15:30 +01:00
Jacob Vosmaer 91ee82c54f Update Sidekiq to 2.17.8 
Conflicts:
	CHANGELOG
 2014-12-04 18:15:04 +01:00
Jacob Vosmaer 57d02099d4 Version 7.5.2 v7.5.2 2014-12-02 14:53:45 +01:00
Jacob Vosmaer 2eafd494cf Merge branch 'release/7.5.2' into '7-5-stable' 
Fixes for 7.5.2

See merge request !1283
 2014-12-02 13:04:39 +00:00
Jacob Vosmaer ede9d47a8a Add wiki restore fix to CHANGELOG 2014-12-01 19:15:57 +01:00
Jacob Vosmaer c7e8d4d649 Remove unnecessary backported change 
Make the diff with 7.5.1 smaller.
 2014-12-01 19:14:58 +01:00
Achilleas PipinellisandJacob Vosmaer 3215dc7116 Properly fix wiki restore. 
ProjectWiki.new() creates a new wiki git repository, so any tries
to bare clone a bundle fail. With this patch we remove the newly
created wiki.git before restoring from the backup bundle.

Conflicts:
	lib/backup/repository.rb
 2014-12-01 19:12:46 +01:00
Jacob Vosmaer 1e033c2ee6 Disable Sidekiq arguments logging by default 
Conflicts:
	config/initializers/4_sidekiq.rb
 2014-12-01 19:11:08 +01:00
Jacob Vosmaer 36679b577b Version 7.5.1 v7.5.1 2014-11-21 16:20:34 +01:00
Jacob Vosmaer 383c6b2906 Add missing timestamps to the 'members' table 2014-11-21 16:14:14 +01:00
Jacob Vosmaer 52a27e740d Version 7.5.0 v7.5.0 2014-11-21 15:28:56 +01:00
Patricio CanoandJacob Vosmaer cf16291a1b Added update guide for updating to 7.5, and pointed installation and updates guides to new version. 2014-11-18 10:59:54 +01:00
Jacob Vosmaer 23433d4d8b Version 7.5.0.rc1 v7.5.0.rc1 2014-11-17 15:44:14 +01: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
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
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
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
Marvin Frick 1f902c2464 fixes the block_removed_ldap_users rake task 
In e23a26a (and later 1bc9936) the API for Gitlab::LDAP::Adapter was
changed. I assume this rake task was an oversight in the refactoring of
the changed class.

While being on it, I noticed that already blocked users cannot be
blocked again.
 2014-11-12 12:06:24 +01:00
Dmitriy Zaporozhets c58edd7c70 Merge branch 'add_issue_edited_timestamp' into 'master' 
Add issue edited timestamp

Comments already have this feature.
So, I think, issues should also have it.
![Снимок экрана 2014-11-08 в 17.07.10](https://gitlab.com/uploads/vernik91/gitlab-ce/4e87a15130/%D0%A1%D0%BD%D0%B8%D0%BC%D0%BE%D0%BA_%D1%8D%D0%BA%D1%80%D0%B0%D0%BD%D0%B0_2014-11-08_%D0%B2_17.07.10.png)

See merge request !235
 2014-11-12 11:02:25 +00:00
Marin Jankovski 857852ce04 Set action on issue/mr creation mail. 2014-11-12 11:59:57 +01:00
Dmitriy Zaporozhets 95e8f9797a Merge pull request #7617 from pkill/issue-280-commit-note-notifications 
Issue-280 Send notifications when a note is added to a commit and author...
 2014-11-12 12:17:27 +02:00
Dmitriy Zaporozhets 1dc99b4cbb Merge pull request #8251 from cirosantilli/factor-regex-message-spec 
Factor regex error messages with spec API tests
 2014-11-12 12:16:59 +02:00
Dmitriy Zaporozhets ae84137108 Merge branch 'bump-gitlab-shell' into 'master' 
Bump gitlab shell

See merge request !1248
 2014-11-11 18:12:33 +00:00