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
8,920 Commits 48 Branches 340 Tags
9afccaa8c69879436c9b0617f8f0243eceee4677
Commit Graph
1087 Commits
Author SHA1 Message Date
Marin Jankovski 4dc09e5c1d New bindings to vote on notes. 2014-03-20 13:33:16 +01:00
Sytse Sijbrandij 6b522bf950 Merge pull request #6457 from lol768/patch-1 
Fix registration error info typo
 2014-03-19 16:06:31 +01:00
Dmitriy Zaporozhets 1921a934a9 Add room placeholder for Slack integration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-19 14:42:13 +02:00
Federico Ravasio e3fc01b3ea Added Slack service integration. 2014-03-18 18:54:30 +01:00
Dmitriy Zaporozhets de855e2420 Default value for Snippet#private 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-17 15:50:16 +02:00
Dmitriy Zaporozhets 25f68a71d6 Project must have namespace for Project#find_with_namespace 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 15:58:10 +02:00
Dmitriy Zaporozhets b5d81174fb Fix mr process order on push. 
First close merge requests that being merged. Then update code of open
mr. This fixes bug when MR merged via command line lose their diff
because code reload was before MR close.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 13:02:55 +02:00
Dmitriy Zaporozhets 0d7986a8c7 Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	db/schema.rb
 2014-03-14 12:00:21 +02:00
Dmitriy Zaporozhets d1bee5e374 Remove default value for Project#imported 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-13 20:35:11 +02:00
Dmitriy Zaporozhets b47646ef13 Add retry feature to project import 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-12 19:26:09 +02:00
Dmitriy Zaporozhets 1436433c7b Add project import state machine 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-12 17:15:03 +02:00
Dmitriy Zaporozhets 56318a24b1 Merge pull request #6474 from jvanbaarsen/post-tag-hook 
Add web hooks on tag
 2014-03-12 09:52:34 +02:00
Daniel CestariandDmitriy Zaporozhets 55fbe71ad1 Fix error with reopened merge request not properly reloading 
If you reopen a Merge Request and then try to update the source branch
it won't properly reload the code since the "reload_code" method still
checks if the MR is "opened" and not just "open" (which includes reopened)
 2014-03-12 08:54:42 +02:00
Dmitriy Zaporozhets f16de8ac8c Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-11 11:29:18 +02:00
Dmitriy Zaporozhets c6d39a14d6 Add User#requires_ldap_check? method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 10:24:07 +02:00
Matt DeTullio 5d6d795d60 Fixes a bug with group member administration 
Group owners were not able to remove any users from their group if they were the only owner.
 2014-03-10 22:56:26 -04:00
Jeroen van Baarsen 9a676ccc0a Added tag_push_events to the web_hooks 
* Added a scope to the web_hooks model
* Added extra checkbooks in de hooks overview window
 2014-03-05 20:44:01 +01:00
Nick HuancaandDmitriy Zaporozhets d02e129a54 added verify false on gitlab_ci integrations 
For those of us running self-signed in gitlab-ci it generates 500s SSL_verify errors if you don't have this.
 2014-03-05 13:23:44 +02:00
lol768 39bb54feb3 Fix registration error info typo 2014-03-02 18:45:38 +00:00
Dmitriy Zaporozhets 36b065e634 Feature: reopen closed merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-28 22:43:16 +02:00
Dmitriy Zaporozhets 3dcfae7524 Add default value for Project#archived 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-28 09:57:19 +02:00
Dmitriy Zaporozhets 5ebdbfab84 Merge branch 'pg_fixes' into 'master' 
Postgres fixes

For applications migrated from MySQL to PostreSQL it fixes some issues
Fixes #1060
 2014-02-28 07:02:44 +00:00
Dmitriy Zaporozhets db80c149cf Merge branch 'gitlab_git_5_6' into 'master' 
Use new gitlab_git gem. It makes CONTRIBUTING.md work
 2014-02-27 20:46:50 +00:00
Dmitriy Zaporozhets ccd617e58e Default values for web hooks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-27 15:56:35 +02:00
Dmitriy Zaporozhets 0de7a7cfcd Add default value for Project#imported boolean 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-27 15:55:22 +02:00
Dmitriy Zaporozhets cac868ee94 Use new gitlab_git gem. It makes CONTRIBUTING.md work 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-27 15:52:14 +02:00
tsl0922 5c3972ae1e remove dead code: broken_diffs 2014-02-27 14:58:27 +08:00
Dmitriy Zaporozhets a1e5d4e8b5 Merge pull request #6382 from jvanbaarsen/contribution-guide-link 
Contribution guide link
 2014-02-26 18:22:22 +02:00
Dmitriy Zaporozhets 63d0c0b93b Merge branch 'gitlab_popen_array' into 'master' 
Change Gitlab::Popen to only accept arrays as commands
 2014-02-26 15:38:56 +00:00
Dmitriy Zaporozhets a355ea6f17 Default values gem 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-26 10:41:44 +02:00
Dmitriy Zaporozhets f1e1e5bf0d Merge pull request #6412 from skv-headless/commit_description 
commit description in commit list
 2014-02-26 09:54:26 +02:00
Dmitriy Zaporozhets 645e8d4705 Move services for collecting items to Finders 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 19:15:08 +02:00
skv-headless 2c28dbd254 commit description in commit list 2014-02-25 18:23:23 +04:00
Dmitriy Zaporozhets 5f31caa0ed Fix read_group ability 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 15:45:19 +02:00
Dmitriy Zaporozhets 75eed4eb83 Implement project collection service 
Main purpose is move big amount of methods from user, group, project
models and place filtering logic in one place.
It also fixes 500 error on group page for PostgreSQL

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-25 14:36:36 +02:00
Jacob Vosmaer 36c2c354fc Adapt use of Gitlab::Popen to new style 2014-02-25 12:00:33 +01:00
Dmitriy Zaporozhets 79dd7beebd Merge branch 'feature/public_groups' into 'master' 
Public Groups

This is the initial work (meaning no tests) for making groups public if they have a public project (or internal for logged in users). This allows issues and merge requests to be viewed, but _not_ group membership. As part of this I have also added back the link in the public project title section (it was removed as it didn't make sense before).

This addesses the following suggestions/issues:

http://feedback.gitlab.com/forums/176466-general/suggestions/5314461-groups-containing-one-or-more-public-projects-shou
Issue #32
https://github.com/gitlabhq/gitlabhq/issues/5203
as well as a few closed issues.

This also changes the public user page to only show groups that are accessible to the user in some manner.
 2014-02-24 19:37:13 +00:00
Dmitriy Zaporozhets 31386adf53 Fixed 500 error on branch and tag creation via UI 
Also fixes issue with branch/tag removing via UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 14:55:27 +02:00
Dmitriy Zaporozhets 05c5b77070 Fix submodules 500 error 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 13:22:00 +02:00
Jeroen van Baarsen bb35c2d36f Added the contribution guide notice 
This is shown at the creation of new issues and new merge requests, when
the repository has a contribution guide file.
 2014-02-22 16:37:10 +01:00
Binsztock RémyandOlivier Gonzalez e7382de108 Add Gemnasium Service for Gitlab 
Conflicts:

	db/schema.rb
 2014-02-21 16:25:22 +01:00
Jason Hollingsworth 2f69213e3f Allow access to groups with public projects. 
Fixed Group avatars to only display when user has read
permissions to at least one project in the group.
 2014-02-20 09:26:38 -06:00
Marin Jankovski c1dddf8c7d Uniqueness check should be case insensitive for username and path, otherwise mysql behaves weird. 2014-02-20 09:45:58 +01:00
Dmitriy Zaporozhets 1c61ac1c64 Refactor MR code reload 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 20:17:26 +02:00
Dmitriy Zaporozhets ddbe978041 Complete api files CRUD 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 12:27:02 +02:00
Dmitriy Zaporozhets 936353edfd Improve notification settings page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-17 18:06:24 +02:00
Dmitriy Zaporozhets 1e106756fa For form MR render only namespace name 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-15 14:36:58 +02:00
Jason Hollingsworth 29cfd33d94 Add email aliases for users 
Emails are used to associate commits with users. The emails
are not verified and don't have to be valid email addresses. They
are assigned on a first come, first serve basis.

Notifications are sent when an email is added.
 2014-02-13 22:59:39 -06:00
Ciro Santillli 439a61783d User can leave group from group page. 2014-02-12 15:52:53 +01:00
Dmitriy Zaporozhets 0bcabdaf83 Use gitlab_git 5.4.0 without BROKEN_DIFF constant 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-12 12:54:49 +02:00