home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
659 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets c5c906fe64 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 15:26:35 +03:00
Dmitriy Zaporozhets 8b00d01c67 Search by issue/mr title and description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:47:30 +03:00
Dmitriy Zaporozhets 9e5bc43263 Pass scope and page to Gitlab::SearchResults#objects instead of initialize 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 00:04:14 +03:00
Dmitriy Zaporozhets 9a4ef7e7eb Search results libraries added 
Gitlab::SearchResults and Gitlab::ProjectSearchResults are libraries we
are going to use to get search results based on query, enitity type and
pagination.

It will allow us to get only issues from project #23 where title or
description includes 'foo'.

Ex:

search_results = Gitlab::ProjectSearchResults.new(project.id, 'foo', 'issues')

search_results.objects => # [<Issues #23>, <Issues #34>]
search_results.issues_count => 2
search_results.total_count => 12 (it includes results from comments and
merge requests too)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 23:32:41 +03:00
Dmitriy Zaporozhets 3cbacad86c Merge branch 'blacklist/unsubscribes' into 'master' 
Add 'unsubscribes' to the paths blacklist

This is to prevent issues with the admin email feature in GitLab EE.

See merge request !1034
 2014-08-23 20:47:40 +00:00
Jacob Vosmaer 3dbd8d2293 Always set the origin remote in satellite actions 
This prevents issues with satellites containing outdated origin remotes
after administrators move the git repositories directory.
 2014-08-22 14:32:04 +02:00
Jacob Vosmaer abb415276f Add 'unsubscribes' to the paths blacklist 
GitLab EE has a /unsubscribes/ route.
 2014-08-22 10:25:13 +02:00
Jacob Vosmaer e4f75fd262 Use one word per line in Gitlab::Blacklist 2014-08-22 10:21:04 +02:00
Andrew Kumanyaev 11b707a62e fix link_to by @bwrsandman 
Add missing '#'
 2014-08-20 00:21:59 +04:00
Andrew Kumanyaev f789f29ca6 Update markdown.rb 
Fix mistake by @qqshfox report
 2014-08-18 11:22:11 +04:00
skv 4e40800166 diff unfold 2014-08-14 15:48:14 +04:00
Dmitriy Zaporozhets ffc284301e Merge branch 'ldap/cache_check' into 'master' 
Cache LDAP check everywhere

See merge request !1008
 2014-08-13 13:11:04 +00:00
Dmitriy Zaporozhets 4535db04b2 Increase import timeout from 2 to 4 minutes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 20:58:39 +03:00
Robert Schilling 99eb283101 Use readme we support to render if there are multiple readmes 2014-08-11 08:50:56 +02:00
Jacob Vosmaer 82dc40936a Cache LDAP check in Gitlab::UserAccess 
This changes the number of LDAP calls when users access GitLab via
Git-over-SSH or the API. LDAP check results are cached for 1 hour.
 2014-08-06 18:03:01 +02:00
Jacob Vosmaer 669682686e Move LDAP timeout code to Gitlab::LDAP::Access 2014-08-06 18:03:01 +02:00
Dmitriy Zaporozhets 8f1e60b057 Fix satellite tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-06 09:52:56 +03:00
Dmitriy Zaporozhets b2a6f4e136 Refactor label rendering and default label set generation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 22:19:47 +03:00
Dmitriy Zaporozhets d45a6b2941 Migrate issue/mr labels from act_as_taggable to own labels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 19:19:26 +03:00
Dmitriy Zaporozhets 2f780af246 Git::Compare does not have limit param any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 14:29:59 +03:00
Dmitriy Zaporozhets bf9ce1f4cf Refactor compare logic for MR. Use satellites only for forks for better performance 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 12:11:16 +03:00
Dmitriy Zaporozhets d30454e112 Override Gitlab::Git::Compare limit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-29 10:29:12 +03:00
Dmitriy Zaporozhets 06154af09a Merge branch 'satellite_compare_gitlab_git' into 'master' 
Use Gitlab::Git::Compare in Satellite::CompareAction

See merge request !976
 2014-07-29 07:28:15 +00:00
Jacob Vosmaer 03ae6b89bd Log Sidekiq arguments 2014-07-28 16:46:36 +02:00
Dmitriy Zaporozhets 931f27ae32 Merge pull request #7141 from PuzzleFlow/uid_should_always_be_string 
Ensure that uid in OAuth is a string
 2014-07-23 20:26:16 +03:00
Dmitriy Zaporozhets 9e613b91d6 Merge pull request #7318 from jvanbaarsen/constant-warning-fix 
Removed some constant allready defined warnings
 2014-07-23 20:23:08 +03:00
Ayrton Araújo 07537faca7 Add support to set satellites timeout 2014-07-21 11:50:29 -04:00
Jeroen van Baarsen 3c439888a6 Removed some constant allready defined warnings 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-07-16 20:12:46 +02:00
Jacob Vosmaer 2ef455078e Gitlab::Git::Compare in Satellite::CompareAction 2014-07-16 17:07:49 +02:00
Dmitriy Zaporozhets d9bc57d18e Merge branch 'branches_with_no_parent' into 'master' 
Branches with no parent cannot be merged

Solves `undefined method 'reduce' for false:FalseClass`

Fixes #1415

See merge request !967
 2014-07-14 11:51:58 +00:00
Jacob Vosmaer 99e1f4888a Remove thread-unsafe Dir.chdir from Satellite#lock 
This is made possible by changes in gitlab-grit 2.6.10.
 2014-07-14 12:16:57 +02:00
Marin Jankovski 207bc8a0e7 Branches without parent commit cannot be merged. 2014-07-14 11:06:14 +02:00
Dmitriy Zaporozhets 6a0cb25096 Dont allow ? in project path 
Because it causes 500 error on every page where link to such project
exists

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-08 18:15:23 +03:00
Dmitriy Zaporozhets 85a15b0e22 Merge pull request #7152 from bhuisgen/master 
Fix LDAP TLS authentication
 2014-07-08 09:44:29 +03:00
Dmitriy Zaporozhets d390219c6f Dont show 'Remove source brnach' checkbox for fork 
Remove source button checkbox always try to remove branch in target
project. For fork source & target projects are differents - so we hide
checkbox from UI. After MR accepted you can easily remove branch with
'Remove branch' button that do remove branch call to valid project

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-04 09:22:46 +03:00
Dmitriy Zaporozhets 8031be73fe Merge branch 'contributors-api' into 'master' 
Contributors api

Fixes #1266

See merge request !934
 2014-07-03 07:28:02 +00:00
Dmitriy Zaporozhets 767bd78081 Use Contributor class instead of hash 2014-07-02 15:09:06 +03:00
Dmitriy Zaporozhets 5a88873e5c Move API contributors logic to repository model 2014-07-02 14:43:23 +03:00
Dmitriy Zaporozhets d35a99e6cb Merge pull request #7204 from cirosantilli/user-validation-msg 
Fix username validation message to match regexp.
 2014-07-02 09:57:14 +03:00
Dmitriy Zaporozhets 8fee5a0572 Make app works with strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 23:24:17 +03:00
Ciro Santilli b1c40e8151 Fix username validation message to match regexp. 
Also used for project, group and web ui new file names.
 2014-06-26 13:31:34 +02:00
Marin JankovskiandDmitriy Zaporozhets f40e87a03b Return better error when account exists when attempting oauth account create. 2014-06-24 15:30:29 +03:00
Dmitriy Zaporozhets aadef92f1d Merge pull request #7013 from jvanbaarsen/better-webhook-information 
Return a little more information in Issue webhook
 2014-06-24 10:37:15 +03:00
Andrew Kumanyaev 1e7598164b Update markdown reference to external issues 
1. Issue may be not only in jira.
2. Rewrite method for support different external issue trackers
 2014-06-23 19:28:03 +04:00
Marin Jankovski 4c575b72d5 Move checking of recepients to a service. 2014-06-23 15:44:49 +02:00
Marin Jankovski 63c1cdce42 Show @all in autocomplete list. 2014-06-23 11:54:58 +02:00
Paweł Świątkowskiandkatafrakt 61a403ff22 ensure that uid is a string 2014-06-21 11:00:54 +02:00
Boris HUISGEN bac7d17c7b Fix LDAP TLS authentication 2014-06-19 10:41:23 +02:00
Andrew Kumanyaev 45f9d15c0e Fix mistake in reference_jira_issue method 
Use local variable instead global
 2014-06-18 11:11:09 +04:00
Jacob Vosmaer 3f1ece2690 Detect closing issues in Merge Request description 2014-06-13 17:25:44 +02:00