home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
1914 Commits
Author SHA1 Message Date
Jacob Vosmaer 36c2c354fc Adapt use of Gitlab::Popen to new style 2014-02-25 12:00:33 +01:00
Jacob Vosmaer 38f4b61a58 Make it possible to call Gitlab::Popen.popen 2014-02-25 11:58:58 +01:00
Jacob Vosmaer 8016cefafe Make the Gitlab::Popen path argument optional 2014-02-25 11:58:22 +01:00
Jacob Vosmaer 0432bdf19e Change Gitlab::Popen to use arrays for commands 2014-02-25 11:57:42 +01:00
awiddersheim e800fe0e50 Fix extra space added in beginning of commit message 
Removes extra space in merge commit messages. This seems to have been
introduced by the functionality added in 38d8d749d which allows a user
to change a merge commit message.
 2014-02-24 20:53:57 -05:00
Jeroen van Baarsen c2ed468d80 Also expose username for the /discover endpoint 
Fixes #6328
 2014-02-20 10:59:03 +01:00
Jakub Jirutka 91e7692b66 Fix searching by extern_uid for LDAP to be case-insensitive 2014-02-18 19:38:22 +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 8686d09d3e Merge branch 'feature/api_fle_encoded' into 'master' 
Complete api files CRUD

Adds ability to read file from repository with content encoded with Base64.
 2014-02-18 14:15:40 +00:00
Dmitriy Zaporozhets 6cf39fe10d Extract commits API to separate file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 12:41:21 +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 3c742dad27 Fixed bug with json files content being escaped in api 
After update to recent grape env['api.format'] does not work any more.
Use content_type for rendering raw json files content

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 11:40:45 +02:00
Dmitriy Zaporozhets 0744eac9c6 Merge pull request #6189 from jcockhren/api_ldap_check_for_user 
the existence of former ldap users doesn't imply LDAP is enabled.
 2014-02-17 09:26:10 +02:00
Dmitriy Zaporozhets f0f88390c1 project_user selectbox with ajax autocomplete 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 16:08:26 +02:00
Dmitriy Zaporozhets 1d48904ac8 Show avatars in ajax user selectbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 15:45:24 +02:00
Dmitriy Zaporozhets 168e0341a3 Merge pull request #5520 from gabetax/rake_group_bulk_add_permissions 
add rake gitlab:import: all_users_to_all_groups and user_to_groups
 2014-02-12 09:40:40 +02:00
Ciro Santillli 61748c993d Headers have ids and link to their own id. 2014-02-11 16:23:33 +01:00
Dmitriy Zaporozhets da34e008c3 Merge pull request #5294 from dalehamel/master 
Ensure directory exists before changing in popen
 2014-02-04 07:21:35 -08:00
Dmitriy Zaporozhets 98fe8fb98d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-04 16:18:40 +02:00
Dmitriy Zaporozhets 97a4d8aea4 Improve code according to new gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-04 14:46:15 +02:00
Johannes Schleifenbaum 7085892e47 remove remaining python references 2014-02-03 11:25:47 +01:00
Dmitriy Zaporozhets 9e181d36ea Dont check for python any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-31 13:09:10 +02:00
Jurnell Cockhren e2e900a338 In the case when a user can and has authenticated with ldap, however 
ldap is disabled in the gitlab config, this fixes the API still calling
the ldap backend.
 2014-01-28 15:10:36 -06:00
Jacob Vosmaer 5de16dee76 Add a custom 502 page 2014-01-28 10:19:22 +01:00
Dmitriy Zaporozhets b6454591cc Merge branch 'highlight-js' into 'master' 
Highlight.Js

Replace pygments code highlight with client-side library - highlight.js

http://highlightjs.org/
 2014-01-28 07:58:59 +00:00
Dmitriy Zaporozhets 891ea6f6e6 Improve highlight for notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-27 18:18:18 +02:00
Dmitriy Zaporozhets c3ae30b60e Merge branch 'upload-limits' into 'master' 
Upload Limits

Better documentation for the upload limit. Please have a hard time when they need to change the upload limits, see https://gitlab.com/gitlab-org/gitlab-ce/issues/5
 2014-01-27 12:44:14 +00:00
Dmitriy Zaporozhets 78b2fb5de9 Add highlight.js support to markdown, snippets etc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-27 13:12:58 +02:00
Jacob Vosmaer abae128915 Use either/or to present options 2014-01-27 11:59:15 +01:00
Jacob Vosmaer 7b32be6eb1 Explain what we know about Nginx chunked requests 2014-01-27 11:19:45 +01:00
Dmitriy Zaporozhets 5221dbfee7 Merge branch 'fix/routing' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce 2014-01-27 07:57:36 +00:00
Corobi 17f7da3d97 improve upgrader "latest version" message 2014-01-25 23:33:55 +00:00
Jason Hollingsworth 71c157e43b Add files to path blacklist. 
Remove empty ErrorsController
 2014-01-24 20:06:44 -06:00
Dmitriy Zaporozhets d1d138562a Merge branch 'report_backup_db_success' into 'master' 
Report success/failure of DB backup commands
 2014-01-24 11:27:48 +00:00
dosire 42220f2a18 Remove version since we don't keep it up to date. 2014-01-23 15:14:07 +01:00
Dmitriy Zaporozhets 28e13634dc Merge branch 'improve/mr_diff' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/project_fork.rb
	features/steps/project/project_forked_merge_requests.rb
	features/steps/project/project_issue_tracker.rb
	features/steps/project/project_markdown_render.rb
	features/steps/shared/project.rb
 2014-01-23 14:38:23 +02:00
Jacob Vosmaer 9e6fc8b526 Report failure of DB backup commands 2014-01-23 11:19:43 +01:00
Dmitriy Zaporozhets 4d56c359d3 Merge pull request #6075 from skv-headless/remove_deprecated_finders 
Remove deprecated finders
 2014-01-22 11:04:56 -08:00
Dmitriy Zaporozhets 4b3afe2325 Always create merge_request_diff if MR created 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 20:22:20 +02:00
dosire 7ad70a56d3 Git over ssh and http are different things. 2014-01-22 17:51:00 +01:00
dosire 119c782e0b More explanation for upload limits. 2014-01-22 17:01:47 +01:00
Jacob Vosmaer 2f4d0a3008 Rephrase LDAP check script output 
The previous phrasing lead some people to believe that there is a limit
on the number of LDAP users that can sign in to a GitLab instance. That
is not the case; the limit in the check script only applies to the
diagnostic information result set, so that running `rake gitlab:check`
does not output thousands of LDAP users.
 2014-01-21 11:05:03 +01:00
dosire 2ddfa882c0 Better wording of the import instructions. 2014-01-20 10:44:40 +01:00
Dmitriy Zaporozhets bb9e01cba6 Merge branch 'init.d' of /mnt/ebs/repositories/arifali1/gitlab-ce 2014-01-20 07:20:07 +00:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Dmitriy Zaporozhets f8aae4b7d8 Merge branch 'add_website_url_to_user' of https://github.com/jeromedalbert/gitlabhq into jeromedalbert-add_website_url_to_user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-01-19 20:23:29 +02:00
Jerome Dalbert 2e3f250d45 Add website url to user 2014-01-18 19:15:10 +00:00
Dmitriy Zaporozhets 4d7792bc38 Merge branch 'explain_ldap_check' into 'master' 
Improve the explanation of the LDAP check script
 2014-01-17 14:14:05 +00:00
Dmitriy Zaporozhets f0d2d28118 Merge branch 'refactoring/context_into_services' into 'master' 
Refactoring context Into services

To prevent confusion where to write logic. Context or Service?
 2014-01-17 09:47:47 +00:00
Dmitriy Zaporozhets efa10c819d Replace context with service in lib 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-16 20:35:21 +02:00