summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'shell_new_style' into 'master'Dmitriy Zaporozhets2014-03-059-42/+54
|\ | | | | | | Use new style shell commands
| * 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
|\ | | | | | | Backup Uploads Symlink
| * Support symlinked public/uploads for backp restoreJacob Vosmaer2014-02-261-2/+3
| | | | | | | | | | | | | | The backup restore code moves any existing uploads directory out of the way before restoring the copy from the backup. If public/uploads was a symlink, this move would replace the symlink. This commit avoids this issue by first resolving any symlinks in the uploads path.
* | Use Gitlab::VERSION to version backupsJacob Vosmaer2014-02-271-16/+10
| | | | | | | | | | | | | | | | | | Previous to this commit, backups were tied to the git revision (SHA1) of the app at the time the backup:create command was invoked. If the SHA1 at the time of restore was different, the script would refuse to restore the backup. This commit loosens this tie so that the backup script only complains if the value of the Gitlab::VERSION constant is different between the time of backup and the time of restore.
* | Merge branch 'pg_force_restore' into 'master'Dmitriy Zaporozhets2014-02-271-0/+2
|\ \ | | | | | | | | | Pg Force Restore
| * | Empty the database during Postgres backup restoreJacob Vosmaer2014-02-261-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | The expected behavior during a GitLab backup restore is to overwrite existing database data. This works for MySQL because the output of mysqldump contains 'DROP TABLE IF EXISTS' statements. pg_dump on the other hand assumes that one will restore into an empty database. When this is not the case, during the restore with psql some of the data will be skipped if existing data is 'in the way'. By first invoking `rake db:schema:load` during a Postgres GitLab backup restore, we make sure that all important data is correctly restored.
* | Merge branch 'highlight_html_escape' into 'master'Dmitriy Zaporozhets2014-02-271-1/+1
|\ \ | | | | | | | | | | | | | | | Enable html_escape for code blocks highlighted in markdown Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/94
| * | html_escape is private for rails 4.0.2 :(Dmitriy Zaporozhets2014-02-271-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Enable html_escape for code blocks highlighted in markdownDmitriy Zaporozhets2014-02-271-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'backup_restore_hooks_bug' into 'master'Dmitriy Zaporozhets2014-02-261-2/+1
|\ \ \ | |/ / |/| | | | | Fix backup/restore git hooks bug
| * | Use gitlab_shell.path to invoke rewrite-hooks.shJacob Vosmaer2014-02-261-2/+1
| |/ | | | | | | | | | | | | The backup restore code for repositories was assuming that gitlab-shell is installed in /home/git/gitlab-shell. This commit changes that to use the configuration setting from gitlab.yml that specifies the path where gitlab-shell is installed.
* | 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
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'feature/api_fle_encoded' into 'master'Dmitriy Zaporozhets2014-02-184-45/+117
|\ | | | | | | | | | | Complete api files CRUD Adds ability to read file from repository with content encoded with Base64.
| * Extract commits API to separate fileDmitriy Zaporozhets2014-02-183-44/+65
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Complete api files CRUDDmitriy Zaporozhets2014-02-181-1/+52
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fixed bug with json files content being escaped in apiDmitriy Zaporozhets2014-02-182-3/+3
|/ | | | | | | 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>
* Merge pull request #6189 from jcockhren/api_ldap_check_for_userDmitriy Zaporozhets2014-02-171-1/+3
|\ | | | | the existence of former ldap users doesn't imply LDAP is enabled.
| * In the case when a user can and has authenticated with ldap, howeverJurnell Cockhren2014-01-281-1/+3
| | | | | | | | | | ldap is disabled in the gitlab config, this fixes the API still calling the ldap backend.
* | project_user selectbox with ajax autocompleteDmitriy Zaporozhets2014-02-131-1/+13
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Show avatars in ajax user selectboxDmitriy Zaporozhets2014-02-131-0/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | 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_groups
| * | add rake gitlab:import: all_users_to_all_groups and user_to_groupsGabe Martin-Dempesy2013-11-021-0/+24
| | | | | | | | | | | | I opted for admins to be added as "owners" instead of "masters" because project masters can managers members, but only group owners can manage members.
* | | 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
|\ \ \ | | | | | | | | Ensure directory exists before changing in popen
| * | | Whitespace fixes to patchDale Hamel2013-10-081-2/+1
| | | |
| * | | Ensure directory exists before changing in popenDale Hamel2013-10-081-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | If the directory does not exist, we want to ensure that it does. Forking repos will fail in some situations because of this issue.
* | | | 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
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Dont check for python any moreDmitriy Zaporozhets2014-01-311-2/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Add a custom 502 pageJacob Vosmaer2014-01-281-0/+2
| |_|/ |/| |
* | | Merge branch 'highlight-js' into 'master'Dmitriy Zaporozhets2014-01-281-5/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Highlight.Js Replace pygments code highlight with client-side library - highlight.js http://highlightjs.org/
| * | | Improve highlight for notesDmitriy Zaporozhets2014-01-271-3/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add highlight.js support to markdown, snippets etcDmitriy Zaporozhets2014-01-271-5/+7
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'upload-limits' into 'master'Dmitriy Zaporozhets2014-01-271-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Git over ssh and http are different things.dosire2014-01-221-2/+2
| | | | |
| * | | | More explanation for upload limits.dosire2014-01-221-0/+1
| | | | |
* | | | | Use either/or to present optionsJacob Vosmaer2014-01-271-2/+2
| | | | |
* | | | | Explain what we know about Nginx chunked requestsJacob Vosmaer2014-01-271-0/+14
| | | | |
* | | | | Merge branch 'fix/routing' of /mnt/ebs/repositories/jhworth.developer/gitlab-ceDmitriy Zaporozhets2014-01-271-1/+1
|\ \ \ \ \
| * | | | | Add files to path blacklist.Jason Hollingsworth2014-01-241-1/+1
| | |/ / / | |/| | | | | | | | | | | | | Remove empty ErrorsController
* | | | | improve upgrader "latest version" messageCorobi2014-01-251-1/+1
|/ / / /
* | | | Merge branch 'report_backup_db_success' into 'master'Dmitriy Zaporozhets2014-01-241-2/+16
|\ \ \ \ | | | | | | | | | | | | | | | Report success/failure of DB backup commands
View Lorry Controller Status