summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix testsonly-syntaxKamil Trzcinski2015-11-031-15/+11
|
* SpellingKamil Trzcinski2015-11-021-1/+1
|
* Extend yml syntax for only and except to support specifying repository pathKamil Trzcinski2015-11-025-111/+273
|
* Merge branch 'rs-dev-issue-2613' into 'master' Douwe Maan2015-11-022-10/+110
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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-012-10/+110
| | | | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2613
* | Merge branch 'rs-editor-submit' into 'master' Douwe Maan2015-11-022-8/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Persist blob editor's value on submit, not on click Prior, the value of the Ace editor was only being persisted if the user physically clicked the submit button, which the "quick submit" behavior doesn't do. Now the value will be properly transferred before any form is submitted. See merge request !1712
| * | Persist blob editor's value on submit, not on clickrs-editor-submitRobert Speicher2015-10-312-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Prior, the value of the Ace editor was only being persisted if the user physically clicked the submit button, which the "quick submit" behavior doesn't do. Now the value will be properly transferred before any form is submitted.
* | | Merge branch 'doc-Gitlab-2-GitLab' into 'master' Achilleas Pipinellis2015-11-017-22/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Gilab -> GitLab Replace `Gitlab` with `GitLab` See merge request !1715
| * | | Gilab -> GitLabRobert Schilling2015-10-317-22/+21
| | | |
* | | | Merge branch 'fix-doc-typo' into 'master' Achilleas Pipinellis2015-11-011-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix typo in rake task doc See merge request !1713
| * | | Fix typo in rake task docRobert Schilling2015-10-311-1/+1
| |/ /
* | | Merge branch 'fix-deadlink-in-docs-ci-examples' into 'master' Achilleas Pipinellis2015-10-311-3/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix deadlink in docs for ci/examples Just fix a deadlink in docs for ci/examples. See merge request !1710
| * | Fix deadlink in docs for ci/examplesTakuya Noguchi2015-10-311-3/+3
| | |
* | | Merge branch 'gitlab-workhorse' into 'master' Dmitriy Zaporozhets2015-10-308-65/+250
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Make sed command GNU-compatiblegitlab-workhorseJacob Vosmaer2015-10-291-1/+1
| | | |
| * | | Add missing "cd"Jacob Vosmaer2015-10-291-0/+1
| | | |
| * | | Switch to gitlab-workhorseJacob Vosmaer2015-10-298-65/+249
| | | |
* | | | Merge branch 'optimize-user-find-by-any-email' into 'master' Yorick Peterse2015-10-303-15/+37
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Improve performance of User.find_by_any_email See merge request !1698
| * | | Adjusted ips/sec for find_by_any_email benchmarksoptimize-user-find-by-any-emailYorick Peterse2015-10-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | While these benchmarks run at roughly 1500 i/sec setting the threshold to 1000 leaves some room for deviations (e.g. due to different DB setups).
| * | | Use a subquery with IDs only for find_by_any_emailYorick Peterse2015-10-301-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This further improves performance of User.find_by_any_email and is roughly twice as fast as the previous UNION setup. Thanks again to @dlemstra for suggesting this.
| * | | Fixed UNION syntax for MySQLYorick Peterse2015-10-301-2/+2
| | | | | | | | | | | | | | | | MySQL doesn't support the previous syntax.
| * | | Use a UNION for User.find_by_any_emailYorick Peterse2015-10-301-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is significantly faster than using a sub-query, at least when run on the GitLab.com production database. The benchmarks are a lot slower now with these changes, most likely due to PostgreSQL choosing a different (and less efficient) plan based on the amount of data present in the test database. Thanks to @dlemstra for suggesting the use of a UNION.
| * | | Changelog entry for User.find_by_any_emailYorick Peterse2015-10-301-0/+1
| | | |
| * | | Improve performance of User.find_by_any_emailYorick Peterse2015-10-302-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This query used to rely on a JOIN, effectively producing the following SQL: SELECT users.* FROM users LEFT OUTER JOIN emails ON emails.user_id = users.id WHERE (users.email = X OR emails.email = X) LIMIT 1; The use of a JOIN means having to scan over all Emails and users, join them together and then filter out the rows that don't match the criteria (though this step may be taken into account already when joining). In the new setup this query instead uses a sub-query, producing the following SQL: SELECT * FROM users WHERE id IN (select user_id FROM emails WHERE email = X) OR email = X LIMIT 1; This query has the benefit that it: 1. Doesn't have to JOIN any rows 2. Only has to operate on a relatively small set of rows from the "emails" table. Since most users will only have a handful of Emails associated (certainly not hundreds or even thousands) the size of the set returned by the sub-query is small enough that it should not become problematic. Performance of the old versus new version can be measured using the following benchmark: # Save this in ./bench.rb require 'benchmark/ips' email = 'yorick@gitlab.com' def User.find_by_any_email_old(email) user_table = arel_table email_table = Email.arel_table query = user_table. project(user_table[Arel.star]). join(email_table, Arel::Nodes::OuterJoin). on(user_table[:id].eq(email_table[:user_id])). where(user_table[:email].eq(email).or(email_table[:email].eq(email))) find_by_sql(query.to_sql).first end Benchmark.ips do |bench| bench.report 'original' do User.find_by_any_email_old(email) end bench.report 'optimized' do User.find_by_any_email(email) end bench.compare! end Running this locally using "bundle exec rails r bench.rb" produces the following output: Calculating ------------------------------------- original 1.000 i/100ms optimized 93.000 i/100ms ------------------------------------------------- original 11.103 (± 0.0%) i/s - 56.000 optimized 948.713 (± 5.3%) i/s - 4.743k Comparison: optimized: 948.7 i/s original: 11.1 i/s - 85.45x slower In other words, the new setup is 85x faster compared to the old setup, at least when running this benchmark locally. For GitLab.com these improvements result in User.find_by_any_email taking only ~170 ms to run, instead of around 800 ms. While this is "only" an improvement of about 4.5 times (instead of 85x) it's still significantly better than before. Fixes #3242
* | | | Merge branch 'minor-ui-fixes' into 'master' Dmitriy Zaporozhets2015-10-303-8/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Minor ui fixes See merge request !1704
| * | | Fix label destroy jsminor-ui-fixesDmitriy Zaporozhets2015-10-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix bg for labels page when no labels presentDmitriy Zaporozhets2015-10-291-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Put delete snippet btn after edit btnDmitriy Zaporozhets2015-10-291-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'binford2k/gitlab-ce-feature/create_new_directories'Douwe Maan2015-10-298-5/+66
|\ \ \ \
| * | | | Update changelog itemDouwe Maan2015-10-291-3/+3
| | | | |
| * | | | Add ability to create directories in the editorBen Ford2015-10-298-5/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'fix-issue-3138' into 'master' Douwe Maan2015-10-292-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force update refs/merge-requests/X/head upon a push to the source branch of a merge request If a user rebases and does a force push, GitLab would not update the `refs/merge-requests/X/head` link. Using the -f flag forces this to happen. Closes #3138 See merge request !1683
| * | | | | Force update refs/merge-requests/X/head upon a push to the source branch of ↵Stan Hu2015-10-292-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a merge request Closes #3138
* | | | | | Merge branch 'shared-file-access' into 'master' Dmitriy Zaporozhets2015-10-295-1/+43
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start putting shared files in "shared" See merge request !1691
| * | | | | Clarify puppiesshared-file-accessJacob Vosmaer2015-10-261-2/+2
| | | | | |
| * | | | | Start putting shared files in "shared"Jacob Vosmaer2015-10-265-1/+43
| | | | | |
* | | | | | Write out internet explorerSytse Sijbrandij2015-10-291-1/+1
| | | | | |
* | | | | | IE message doesn't need a headingSytse Sijbrandij2015-10-291-5/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'closing-issue-tracker' into 'master' Dmitriy Zaporozhets2015-10-281-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add copy paste text for closing down the Github issue tracker @sytses I think we talked about closing down the Issue tracker on Github. A first step can be closing all the older issues and steering people towards the gitlab.com issue tracker. What do you think about this text? See merge request !1689
| * | | | | Add copy paste text for closing down the Github issue trackerclosing-issue-trackerJeroen van Baarsen2015-10-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | | | Merge branch 'edit-new-cross-references' into 'master' Dmitriy Zaporozhets2015-10-280-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use issue editor as cross reference comment author when issue is edited with a new mention. Fixes #3244. See merge request !1696
* \ \ \ \ \ \ Merge branch 'rs-update-nprogress-rails' into 'master' Dmitriy Zaporozhets2015-10-282-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump nprogress-rails to 0.1.6.7 Closes #2866 See merge request !1686
| * | | | | | | Bump nprogress-rails to 0.1.6.7rs-update-nprogress-railsRobert Speicher2015-10-262-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #2866
* | | | | | | | Merge branch 'edit-new-cross-references'Dmitriy Zaporozhets2015-10-284-3/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Use issue editor as cross reference comment author when issue is edited with ↵edit-new-cross-referencesDouwe Maan2015-10-284-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a new mention.
* | | | | | | | Merge branch 'cleanup-ci-integration' into 'master' Dmitriy Zaporozhets2015-10-288-83/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated CI events from project settings page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @ayufan Part of #2594 See merge request !1694
| * | | | | | | | Remove deprecated CI events from project settings pageDmitriy Zaporozhets2015-10-288-83/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch 'fix_permission_doc' into 'master' Achilleas Pipinellis2015-10-281-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the permission doc The guest users was missing "Pull project code" and "Download project". /cc @axil See merge request !1695
| * | | | | | | | Fixed the permission docHannes Rosenögger2015-10-281-2/+2
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | The guest users was missing "Pull project code" and "Download project".
* | | | | | | | Merge branch 'gitlab-shell-v2.6.6' into 'master' Dmitriy Zaporozhets2015-10-282-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump gitlab-shell to v2.6.6 See merge request !1673