home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,718 Commits 48 Branches 340 Tags
cfee95d0327485dffb8ea4d698d3f7f310fc6c19
Commit Graph
12718 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets cfee95d032 Merge pull request #8340 from cirosantilli/multi-ruby-install-v2 
Web edit and HTTPS push work if multiple Rubies installed v2
 2014-11-18 15:00:56 +02:00
Dmitriy Zaporozhets a4e98f0ec9 Merge branch 'fork-to-group' into 'master' 
Fork to group

Fixes #1592

* project can be forked into group
* fork link always lead to fork page where you select namespace where to fork

See merge request !1253
 2014-11-18 10:44:15 +00:00
Ciro Santilli 533f4cdf30 gitlab shell works if multiple rubies installed 
Before this it would fail because git hooks automatically prepend
things to the path, which can lead the wrong Ruby version to be called
in which dependencies are not installed.

To make sure that this is correct, the forked_merge_requests commented
out test that depends on this change was uncommented.

For that test to pass, it is also necessary to setup the mock server
on port 3001 under test_env.rb.
 2014-11-18 11:38:23 +01:00
Jacob Vosmaer d803f210aa 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

See merge request !1259
 2014-11-18 09:49:00 +00:00
Patricio Cano da35baed65 Added update guide for updating to 7.5, and pointed installation and updates guides to new version. 2014-11-17 16:56:51 -05:00
Dmitriy Zaporozhets e37461979a Merge branch 'master' of github.com:gitlabhq/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-11-17 17:56:07 +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
Robert Schilling 944e2445c4 Merge pull request #8312 from bbodenmiller/patch-4 
remove duplicate time zone entry in CHANGELOG
 2014-11-17 01:10:28 +01:00
Robert Schilling ee6da7eacd Merge pull request #8310 from bbodenmiller/patch-3 
fix backup rake task
 2014-11-17 01:05:48 +01:00
Robert Schilling d9cb3ffaf0 Merge pull request #8316 from bbodenmiller/patch-1 
remove extra cd command
 2014-11-17 00:59:55 +01:00
Ben Bodenmiller 5b5446bd76 remove extra cd command 2014-11-15 06:25:08 -08:00
Ben Bodenmiller 987007b8db remove duplicate time zone entry in CHANGELOG 2014-11-15 02:17:01 -08: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
Dmitriy Zaporozhets 2388fdd7c6 Improve fork to namespaces feature 
* Show namespace thumbnail differently if project was already forked
* Show loading spinner when click on fork
* Fork link navigates to personal namespace only if no manageable groups exists

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-14 16:06:39 +02: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 d2c3c98e3c Routing specs for fork projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-14 12:55:13 +02: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
Ben Bodenmiller e0467e8f58 fix backup rake task 2014-11-14 02:41:58 -08:00
Marin Jankovski ced2438312 Clean the string with commit author and email. 2014-11-14 11:08:58 +01:00
Dmitriy Zaporozhets e08e405ac4 Select namespace where to fork project 
Now you can fork project into group or personal namespace.
Also I moved fork logic from ProjectsController to own fork resource

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-13 22:06:19 +02:00
Dmitriy Zaporozhets 18c8226566 Refactor project fork service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-13 19:40:47 +02:00
Dmitriy Zaporozhets 58011d61c3 Merge branch 'prepare-fork-to-given-namespace' of https://gitlab.com/bkaindl/gitlab-ce into bkaindl/gitlab-ce-prepare-fork-to-given-namespace 2014-11-13 19:36:28 +02: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