summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Add support for batch download operationlfs-batch-downloadKamil Trzcinski2015-11-192-28/+79
|
* Merge branch 'atom-feed-latest-update' into 'master' Yorick Peterse2015-11-191-0/+34
|\ | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of user profiles, finding groups, and finding projects This MR improves the following: * Rendering of profile pages and Atom feeds * Finding groups (using GroupsFinder & friends) * Finding projects (using ProjectsFinder & friends) Initially this MR was intended to only improve rendering of Atom feeds, but over time other fixes were introduced as well as the same code was the cause of all these problems. See merge request !1790
| * Fix UNION syntax for MySQLYorick Peterse2015-11-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Apparently MySQL doesn't support this syntax: (...) UNION (...) instead it only supports: ... UNION ...
| * Added Gitlab::SQL::Union classYorick Peterse2015-11-181-0/+34
| | | | | | | | | | | | | | This class can be used to join multiple AcitveRecord::Relation objects together using a SQL UNION statement. ActiveRecord < 5.0 sadly doesn't support UNION and existing Gems out there don't handle prepared statements (e.g. they never incremented the variable bindings).
* | Merge branch 'ce-mirror-backport' into 'master' Douwe Maan2015-11-181-3/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport relevant changes from gitlab-org/gitlab-ee!51 To do: - [x] Update gitlab-shell See merge request !1822
| * | Store and show reason why import failed.Douwe Maan2015-11-181-3/+4
| |/
* | Merge pull request #9838 from evindor/masterDouwe Maan2015-11-181-1/+1
|\ \ | |/ |/| Fix github importer to handle empty issues
| * Fix github importer to handle empty issuesArseny Zarechnev2015-11-181-1/+1
| |
* | Remove small code duplication in user_reference_filter.rbDmitriy Zaporozhets2015-11-171-6/+9
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Remove duplication in reference filtersDmitriy Zaporozhets2015-11-164-166/+119
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add support for git lfs.lfsMarin Jankovski2015-11-164-4/+410
|
* Relative links in the README file shown on the repository homepage should pointAlec Cooper2015-11-141-1/+1
| | | | to the default branch, not to master
* Merge branch 'refactor-complex-methods' into 'master' Dmitriy Zaporozhets2015-11-132-78/+102
|\ | | | | | | | | | | | | | | | | Refactor complex methods Make flog part of CI check which is not allowed to fail. I used high score (70) and refactored most complex method. In future releases we should lower acceptable score to something like 40..50 Part of #3444 See merge request !1794
| * Move spec to proper place and fix unused variablerefactor-complex-methodsDmitriy Zaporozhets2015-11-131-1/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Even more refactoring to inline_diff.rbDmitriy Zaporozhets2015-11-131-16/+23
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Split complex methods in GoogleCodeImport::ImporterDmitriy Zaporozhets2015-11-131-46/+47
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Split complex Gitlab::InlineDiff::processing methodDmitriy Zaporozhets2015-11-131-19/+36
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add ignore white space option in merge request diffMinsik Yoon2015-11-131-2/+2
|/ | | | | | fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393). Add ignore whitespace optoin to Commits Compare view
* Implement Build ArtifactsKamil Trzcinski2015-11-101-0/+1
| | | | | | | - Offloads uploading to GitLab Workhorse - Use /authorize request for fast uploading - Added backup recipes for artifacts - Support download acceleration using X-Sendfile
* Only load rblineprof when actually neededYorick Peterse2015-11-092-1/+2
| | | | | This ensures the application can still boot when the "development" group is not available.
* Track the amount of times views are renderedYorick Peterse2015-11-091-14/+43
|
* Added specs and source documentation for SherlockYorick Peterse2015-11-098-12/+119
|
* Added Sherlock, a custom profiling tool for GitLabYorick Peterse2015-11-099-0/+408
| | | | | | | | | | | | | | | | | | | | | | | | | Sherlock will be a new GitLab specific tool for measuring the performance of Rails requests (and SideKiq jobs at some point). Some of the things that are currently tracked: * SQL queries along with their timings, backtraces and query plans (using "EXPLAIN ANALYZE" for PostgreSQL and regular "EXPLAIN" for MySQL) * Timings of application files (including views) on a per line basis * Some meta data such as the request method, path, total duration, etc More tracking (e.g. Rugged or gitlab-shell timings) might be added in the future. Sherlock will replace any existing tools we have used so far (e.g. active_record_query_trace and rack-mini-profiler), hence the corresponding Gems have been removed from the Gemfile. Sherlock can be enabled by starting Rails as following: ENABLE_SHERLOCK=1 bundle exec rails s Recorded transactions can be found at `/sherlock/transactions`.
* Enable shared runners for all new projectsKamil Trzcinski2015-11-051-1/+2
|
* Merge branch 'facebook-auth' into 'master' Robert Speicher2015-11-041-1/+8
|\ | | | | | | | | Add Facebook authentication See merge request !1740
| * Use proper labels for OAuth providersDouwe Maan2015-11-031-1/+8
| |
* | Replace all usages of `git` command with configurable binary pathrs-git-bin-pathRobert Speicher2015-11-033-6/+6
|/ | | | Closes #3311
* 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 'olhado/gitlab-ce-commit-search'Dmitriy Zaporozhets2015-11-031-1/+15
|\ \ | |/ |/|
| * 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
| |
| * 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.
* | 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-301-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-291-1/+1
| | | |
* | | | 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
| | |
* | | 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 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
| | | |
* | | | 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 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-162-3/+10
|\ \ \
| * \ \ Merge branch 'git-archive-golang' into 'master' Douwe Maan2015-10-151-1/+8
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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-157-2/+100
| | |\ \
| | * | | Let gitlab-git-http-server handle archive downloadsJacob Vosmaer2015-10-081-1/+8
| | | | | | | | | | | | | | | | | | | | This change relies on changes in gitlab_git and gitlab-git-http-server.
View Lorry Controller Status