summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Put nginx configgitlab-pagesKamil Trzcinski2015-11-042-0/+55
|
* Serve static pagesKamil Trzcinski2015-11-041-0/+15
|
* Fix CI APIKamil Trzcinski2015-11-041-1/+1
|
* Support download acceleration using X-SendfileKamil Trzcinski2015-11-042-2/+9
|
* Added backup recipes for artifactsKamil Trzcinski2015-11-043-1/+35
|
* Implement Build ArtifactsKamil Trzcinski2015-11-0412-3/+225
| | | | Use X-File header for fast artifacts upload - requires gitlab-workhorse extension
* Merge branch 'spread-runner-last-updated-at' into 'master' Robert Speicher2015-11-031-1/+3
|\ | | | | | | | | | | | | | | Spread out runner contacted_at updates This is meant to prevent having too many concurrent UPDATE requests caused by runners checking in. See merge request !1722
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵spread-runner-last-updated-atJacob Vosmaer2015-11-036-35/+59
| |\ | | | | | | | | | spread-runner-last-updated-at
| * | Spread out runner contacted_at updatesJacob Vosmaer2015-11-021-1/+3
| | |
* | | Merge branch 'web_hook_repo_changes'Valery Sizov2015-11-031-2/+31
|\ \ \ | |_|/ |/| |
| * | Add added, modified and removed properties to commit object in webhookweb_hook_repo_changesValery Sizov2015-11-031-2/+31
| | |
* | | Merge branch 'only-syntax' into 'master' Kamil Trzciński2015-11-031-30/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend yml syntax for only and except to support specifying repository path This allows to limit execution of jobs to specific repository. For example: ```yaml job: only: - branches@gitlab-org/gitlab-ce except: - master@gitlab-org/gitlab-ce ``` The above will run `job` for all branches on `gitlab-org/gitlab-ce`, except master. @dzaporozhets @JobV @vsizov Please review. See merge request !1720
| * | | Extend yml syntax for only and except to support specifying repository pathKamil Trzcinski2015-11-021-30/+34
| | | |
* | | | Merge branch 'olhado/gitlab-ce-commit-search'Dmitriy Zaporozhets2015-11-032-4/+18
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix commits search for empty repositoryDmitriy Zaporozhets2015-11-031-1/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Refactor search by commits messageolhado/gitlab-ce-commit-searchDmitriy Zaporozhets2015-11-021-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Trying to incorporate suggestions from comments on Merge Request 1661Michael Chmielewski2015-10-281-1/+1
| | | |
| * | | Added @commits to list of tags.Mike Chmielewski2015-10-281-3/+3
| | | |
| * | | Add support for searching commit log messagesJonathan Schoeffling2015-10-281-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include the log messages of recent commits in project-level search results, providing functionality similar to 'git log --grep'. Update repository model rspec tests to validate the output of Repository#commits_with_log_matching.
* | | | Explicitly require backup/filesrs-require-backup-filesRobert Speicher2015-11-022-0/+4
| | | |
* | | | Merge branch 'api_file_touched_at' into 'master' Dmitriy Zaporozhets2015-11-021-1/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Add ability to fetch the commit ID of the last commit that actually touched a file https://dev.gitlab.org/gitlab/gitlabhq/issues/2564 See merge request !1718
| * | | Add ability to fetch the commit ID of the last commit that actually touched ↵api_file_touched_atValery Sizov2015-11-021-1/+3
| | | | | | | | | | | | | | | | a file
* | | | Merge branch 'backup-improvements' into 'master' Kamil Trzciński2015-11-025-85/+74
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce disk IO and space usage during backups This is based on improvements made to the GitLab CI 8.0 backup script. - Avoid creating many small intermediate files while backing up builds and uploads by using tar and light gzip compression - Use same backup/restore code for uploads and builds - Only store a compressed intermediate DB dump See merge request !1520
| * | | Do no rely on basename of builds, uploadsbackup-improvementsJacob Vosmaer2015-10-163-6/+15
| | | |
| * | | Remove superfluous mkdir -pJacob Vosmaer2015-10-061-2/+0
| | | |
| * | | Remove unused variableJacob Vosmaer2015-10-061-3/+2
| | | |
| * | | Keep old path: db/database.sql.gzJacob Vosmaer2015-10-062-3/+4
| | | | | | | | | | | | | | | | | | | | Documentation elsewhere refers to this internal path, let's keep it.
| * | | Remove old "files" tarball explicitlyJacob Vosmaer2015-10-061-0/+1
| | | |
| * | | Reduce disk IO during SQL backupJacob Vosmaer2015-10-062-31/+26
| | | | | | | | | | | | | | | | | | | | By using light gzip compression we can save a lot of disk IO during the backup.
| * | | Use tar for intermediate backup storageJacob Vosmaer2015-10-064-59/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | During the backup we create an intermediate copy of two directories: builds and uploads. Instead of creating many small files with 'cp -r', we now use tar (and fast gzip) to create single intermediate files. This saves on disk IO and disk space while creating a backup.
* | | | Merge branch 'rs-dev-issue-2613' into 'master' Douwe Maan2015-11-021-0/+19
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add custom protocol whitelisting to SanitizationFilter Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2613 We allow any protocol for autolinks: irc://irc.freenode.net/git But manual Markdown links with the same protocol get sanitized: `[This will not be clickable](irc://irc.freenode.net/git)`: [This will not be clickable](irc://irc.freenode.net/git) To get around this we have to first allow *all* protocols, and then manually clean dangerous (i.e., `javascript:`) protocols. See merge request !1496
| * | | Add custom protocol whitelisting to SanitizationFilterrs-dev-issue-2613Robert Speicher2015-10-011-0/+19
| | | | | | | | | | | | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2613
* | | | Merge branch 'gitlab-workhorse' into 'master' Dmitriy Zaporozhets2015-10-305-64/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to gitlab-workhorse This is a little annoying but it is better to change this name then to be stuck with a bad name for a long time. Reasons for the name change: https://gitlab.com/gitlab-org/gitlab-git-http-server/issues/13 See merge request !1707
| * | | | Switch to gitlab-workhorseJacob Vosmaer2015-10-295-64/+61
| | | | |
* | | | | Add ability to create directories in the editorBen Ford2015-10-291-0/+17
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simply type a name with a `/` directory separator and new directories will be created. This does not do the fancy UI work that github.com does, but it will get the job done. I could not find tests for file creation, so I didn't add a test for this slight behaviour modification. I did test directory traversals though, using both absolute paths like `/tmp/foo.txt` and relative paths like `../../foo.txt`. Neither case escaped the repository, though attempting to traverse with a relative path resulted in a 500 error that did not affect application stability upon reload.
* | | | Merge branch 'dirceu/gitlab-ce-fix-project-search-with-unmatched-parentheses'Douwe Maan2015-10-251-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix issue #3055 (project search with unmatched parentheses)dirceu/gitlab-ce-fix-project-search-with-unmatched-parenthesesDirceu Pereira Tiegs2015-10-211-1/+1
| | | |
* | | | Merge branch 'fix-wiki-clone-over-http' into 'master' Robert Speicher2015-10-231-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cloning Wiki repositories via HTTP Cloning a project Wiki over HTTP would end up cloning the main repository since the .wiki extension was being stripped. Closes #3106 See merge request !1676
| * | | | Fix cloning Wiki repositories via HTTPStan Hu2015-10-221-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cloning a project Wiki over HTTP would end up cloning the main repository since the .wiki extension was being stripped. Closes #3106
* | | | | Merge pull request #9762 from ↵Stan Hu2015-10-223-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | huacnlee/fix/api-helpers-bad-autoload-name-for-master Fix API::APIHelpers -> API::Helpers again for master
| * | | | Fix API::APIHelpers -> API::Helpers;Jason Lee2015-10-233-3/+3
| | | | | | | | | | | | | | | | | | | | Rails Autoload find file to require is use , APIHelpers -> api_helpers.rb, not helpers.rb;
* | | | | Merge branch 'project-path-case-sensitivity' into 'master' Robert Speicher2015-10-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefer project with exact path to differently cased one when both exist. Fixes #3113. See merge request !1649
| * | | | | Fix Gitlab::Database#mysql?Douwe Maan2015-10-221-1/+1
| | | | | |
* | | | | | Require jobs to be namedfail-on-empty-job-nameKamil Trzcinski2015-10-221-15/+23
| | | | | |
* | | | | | Remove CI migration taskremove-ci-migrationKamil Trzcinski2015-10-215-297/+0
| | | | | |
* | | | | | Speed up searching for text references a bitYorick Peterse2015-10-201-4/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a node is ignored there's no need for searching for a given pattern. In turn, when searching for the pattern there's no need to construct a MatchData object as we only care about presence (or lack thereof), not the resulting matches. In terms of performance this cuts down about 200 ms when loading issue #2164 locally, though this varies a bit depending on system load.
* | | | | Fix regex in redis version checkBenny Schimmer2015-10-191-1/+1
| | | | |
* | | | | Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into ↵Douwe Maan2015-10-191-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add ability to remove the fork relationship from project settings ![Screen_Shot_2015-10-18_at_12.37.24](/uploads/676571642a4c90f7f286280d714599a3/Screen_Shot_2015-10-18_at_12.37.24.png) ![Screen_Shot_2015-10-18_at_12.37.28](/uploads/1a069ecfc4cd3b5438772a9c3f04b6fc/Screen_Shot_2015-10-18_at_12.37.28.png) Replaces !1579. Fixes #2578. See merge request !1636
| * \ \ \ \ Merge branch 'master' into remove-forks-from-projects-settingsHan Loong Liauw2015-10-1720-57/+284
| |\ \ \ \ \
| * | | | | | Made suggested content changes based on MR ReviewHan Loong Liauw2015-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the authentication method for removing fork through API Reflected changes to new auth method in API specs