summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
| * | | | | | Adds ability to remove the forked relationshipHan Loong Liauw2015-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was previously possible through the API but can now be done through the project#edit settings screen if the current user is the owner of the project. Update changelog
* | | | | | | Fix bug where a push would only create cross references from the first commit.hash-block-returnDouwe Maan2015-10-181-1/+1
| | | | | | |
* | | | | | | Merge branch 'master' into rs-redactor-filterrs-redactor-filterDouwe Maan2015-10-1610-52/+93
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Shut up, RubocopRobert Speicher2015-10-151-1/+1
| | | | | | |
| * | | | | | Fix specsKamil Trzcinski2015-10-151-1/+1
| | | | | | |
| * | | | | | Implement when syntax in .gitlab-ci.ymlKamil Trzcinski2015-10-152-1/+27
| | | | | | |
| * | | | | | Merge branch 'stanhu/gitlab-ce-fix-api-mr-comment-notifications'Dmitriy Zaporozhets2015-10-151-2/+10
| |\ \ \ \ \ \
| | * | | | | | Fix bug where merge request comments created by API would not trigger ↵Stan Hu2015-10-101-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifications Closes https://github.com/gitlabhq/gitlabhq/issues/9715
| * | | | | | | Merge branch 'user-by-login-performance' into 'master' Yorick Peterse2015-10-151-0/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve User.by_login performance This greatly speeds up the performance of `User.by_login`. I adopted some changes from @haynes in this patch, the credits go to him for coming up with those originally. Fixes #2341 See merge request !1545
| | * | | | | | | Improve performance of User.by_loginuser-by-login-performanceYorick Peterse2015-10-151-0/+2
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance is improved in two steps: 1. On PostgreSQL an expression index is used for checking lower(email) and lower(username). 2. The check to determine if we're searching for a username or Email is moved to Ruby. Thanks to @haynes for suggesting and writing the initial implementation of this. Moving the check to Ruby makes this method an additional 1.5 times faster compared to doing the check in the SQL query. With performance being improved I've now also tweaked the amount of iterations required by the User.by_login benchmark. This method now runs between 900 and 1000 iterations per second.
| * | | | | | | Merge branch 'git-archive-golang' into 'master' Douwe Maan2015-10-154-15/+47
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let gitlab-git-http-server handle archive downloads This change relies on changes in gitlab_git and gitlab-git-http-server. fixes #2429 See merge request !1548
| | * | | | | | Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-1517-7/+235
| | |\ \ \ \ \ \
| | * | | | | | | Fix NGINX API download regexJacob Vosmaer2015-10-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users are allowed to supply namespace%2Fproject instead of a numeric ID
| | * | | | | | | Let gitlab-git-http-server handle archive downloadsJacob Vosmaer2015-10-084-15/+47
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | This change relies on changes in gitlab_git and gitlab-git-http-server.
| * | | | | | | Merge branch 'incoming-email-config' into 'master' Robert Speicher2015-10-142-34/+7
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Reply by email easier to configure Builds on !1566. Omnibus companion MR: gitlab-org/omnibus-gitlab!510 (cc @marin) See merge request !1580
| | * | | | | | Make Reply by email easier to configureDouwe Maan2015-10-132-34/+7
| | | |/ / / / | | |/| | | |
* | | | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-1517-7/+235
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'simplify-cross-references' into 'master' Robert Speicher2015-10-141-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify code around (cross)-references See merge request !1568
| | * | | | | | Simplify code around (cross)-referencesDouwe Maan2015-10-121-0/+2
| | |/ / / / /
| * | | | | | Fix: Images cannot show when projects' path was changeduploads_path_fixValery Sizov2015-10-143-0/+84
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/cernvcs_hide_passwrd'Valery Sizov2015-10-142-1/+13
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-cecernvcs_hide_passwrdValery Sizov2015-10-142-1/+13
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Hide passwords to non-admin users in the services APIAlex Lossent2015-10-122-1/+13
| | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | In order to be consistent with !1490 doing it for the web interface
| * | | | | | Merge remote-tracking branch 'origin/inified_404_error'Valery Sizov2015-10-141-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Only render 404 page from /publicinified_404_errorValery Sizov2015-10-131-1/+1
| | |/ / / /
| * | | | | [ci skip] Fix wrong commentsue4452015-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to `attributes_for_keys` and API doc, `POST /projects/:id/merge_requests` is received `target_project_id` (NOT `target_project`)
| * | | | | Fix broken testsKamil Trzcinski2015-10-121-1/+1
| | | | | |