summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-03-101-4/+4
|\
| * Merge pull request #6492 from tsigo/gitlab-shell-custom-pathDmitriy Zaporozhets2014-03-101-4/+4
| |\
| | * Respect custom gitlab_shell path in gitlab:gitlab_shell:check taskRobert Speicher2014-03-071-4/+4
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-03-101-1/+1
|\ \ \ | |/ / |/| |
| * | Some people are getting the error 'The remote end hung up unexpectedly' due t...dosire2014-03-101-1/+1
| |/
* | Popen (at least on OSX) expects an Array, not a StringRobert Speicher2014-03-071-1/+1
|/
* Merge branch 'shell_new_style' into 'master'Dmitriy Zaporozhets2014-03-059-42/+54
|\
| * Invoke Kernel#system with separate argumentsJacob Vosmaer2014-03-034-20/+24
| * Replace backticks with Gitlab::PopenJacob Vosmaer2014-03-036-22/+30
* | change deploy.sh without mysql, now that we are moving to postgresArif Ali2014-03-041-2/+2
|/
* Merge branch 'backup_uploads_symlink' into 'master'Dmitriy Zaporozhets2014-03-011-2/+3
|\
| * Support symlinked public/uploads for backp restoreJacob Vosmaer2014-02-261-2/+3
* | Use Gitlab::VERSION to version backupsJacob Vosmaer2014-02-271-16/+10
* | Merge branch 'pg_force_restore' into 'master'Dmitriy Zaporozhets2014-02-271-0/+2
|\ \
| * | Empty the database during Postgres backup restoreJacob Vosmaer2014-02-261-0/+2
| |/
* | Merge branch 'highlight_html_escape' into 'master'Dmitriy Zaporozhets2014-02-271-1/+1
|\ \
| * | html_escape is private for rails 4.0.2 :(Dmitriy Zaporozhets2014-02-271-1/+1
| * | Enable html_escape for code blocks highlighted in markdownDmitriy Zaporozhets2014-02-271-1/+1
* | | Merge branch 'backup_restore_hooks_bug' into 'master'Dmitriy Zaporozhets2014-02-261-2/+1
|\ \ \ | |/ / |/| |
| * | Use gitlab_shell.path to invoke rewrite-hooks.shJacob Vosmaer2014-02-261-2/+1
| |/
* | Adapt use of Gitlab::Popen to new styleJacob Vosmaer2014-02-251-1/+1
* | Make it possible to call Gitlab::Popen.popenJacob Vosmaer2014-02-251-0/+2
* | Make the Gitlab::Popen path argument optionalJacob Vosmaer2014-02-251-1/+2
* | Change Gitlab::Popen to use arrays for commandsJacob Vosmaer2014-02-251-2/+7
|/
* Refactor MR code reloadDmitriy Zaporozhets2014-02-181-2/+0
* Merge branch 'feature/api_fle_encoded' into 'master'Dmitriy Zaporozhets2014-02-184-45/+117
|\
| * Extract commits API to separate fileDmitriy Zaporozhets2014-02-183-44/+65
| * Complete api files CRUDDmitriy Zaporozhets2014-02-181-1/+52
* | Fixed bug with json files content being escaped in apiDmitriy Zaporozhets2014-02-182-3/+3
|/
* Merge pull request #6189 from jcockhren/api_ldap_check_for_userDmitriy Zaporozhets2014-02-171-1/+3
|\
| * In the case when a user can and has authenticated with ldap, howeverJurnell Cockhren2014-01-281-1/+3
* | project_user selectbox with ajax autocompleteDmitriy Zaporozhets2014-02-131-1/+13
* | Show avatars in ajax user selectboxDmitriy Zaporozhets2014-02-131-0/+6
* | Merge pull request #5520 from gabetax/rake_group_bulk_add_permissionsDmitriy Zaporozhets2014-02-121-0/+24
|\ \
| * | add rake gitlab:import: all_users_to_all_groups and user_to_groupsGabe Martin-Dempesy2013-11-021-0/+24
* | | Headers have ids and link to their own id.Ciro Santillli2014-02-111-0/+11
* | | Merge pull request #5294 from dalehamel/masterDmitriy Zaporozhets2014-02-041-0/+6
|\ \ \
| * | | Whitespace fixes to patchDale Hamel2013-10-081-2/+1
| * | | Ensure directory exists before changing in popenDale Hamel2013-10-081-0/+7
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-02-041-46/+0
|\ \ \ \
| * | | | remove remaining python referencesJohannes Schleifenbaum2014-02-031-46/+0
* | | | | Improve code according to new gitlab_gitDmitriy Zaporozhets2014-02-043-12/+24
|/ / / /
* | | | Dont check for python any moreDmitriy Zaporozhets2014-01-311-2/+0
* | | | Add a custom 502 pageJacob Vosmaer2014-01-281-0/+2
| |_|/ |/| |
* | | Merge branch 'highlight-js' into 'master'Dmitriy Zaporozhets2014-01-281-5/+5
|\ \ \
| * | | Improve highlight for notesDmitriy Zaporozhets2014-01-271-3/+1
| * | | Add highlight.js support to markdown, snippets etcDmitriy Zaporozhets2014-01-271-5/+7
* | | | Merge branch 'upload-limits' into 'master'Dmitriy Zaporozhets2014-01-271-1/+2
|\ \ \ \
| * | | | Git over ssh and http are different things.dosire2014-01-221-2/+2
| * | | | More explanation for upload limits.dosire2014-01-221-0/+1
View Lorry Controller Status