home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,867 Commits 48 Branches 340 Tags
ce_upstream
Commit Graph
475 Commits
Author SHA1 Message Date
Valery Sizov 7b327b68e3 Merge remote-tracking branch 'origin/master' into ce_upstream 2015-12-01 19:54:45 +02:00
Valery Sizov e92ceb7b57 fix specs 2015-11-30 16:12:31 +02:00
Valery Sizov 18c7336892 Merge remote-tracking branch 'origin/master' into ce_upstream 2015-11-24 18:06:46 +02:00
Yorick Peterse 97f8c6279f Added total query time to Sherlock 
This makes it easier to see if a problem is caused by slow queries or
slow Ruby code (unrelated to any SQL queries that might be used).
 2015-11-24 10:57:21 +01:00
Marin Jankovski 899807f604 Update required version of lfs client and separate the docs for users and admins. 2015-11-20 16:10:08 +01:00
Dmitriy Zaporozhets 1f4dc0b14c Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-20 14:05:09 +01:00
Marin Jankovski 89dec03c73 Error 501 when client is using deprecated API. 2015-11-20 12:50:47 +01:00
Kamil TrzcinskiandMarin Jankovski 760dc3e42c Fix upload tests, reformat code and make rubocop happy 2015-11-20 12:50:45 +01:00
Kamil TrzcinskiandMarin Jankovski 7ea48bfb25 Part of tests done [ci skip] 2015-11-20 12:50:42 +01:00
Kamil TrzcinskiandMarin Jankovski 2811347884 Add support for batch download operation 2015-11-20 12:49:07 +01:00
Marin Jankovski dbc0be1b27 Error 501 when client is using deprecated API. 2015-11-20 12:45:30 +01:00
Kamil Trzcinski b8d8292bef Fix upload tests, reformat code and make rubocop happy 2015-11-20 12:21:41 +01:00
Kamil Trzcinski 14d95b0529 Part of tests done [ci skip] 2015-11-20 11:59:32 +01:00
Yorick Peterse 1cdee35f60 Merge branch 'atom-feed-latest-update' into 'master' 
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
 2015-11-20 11:02:27 +01:00
Kamil Trzcinski 888821f9ff Add support for batch download operation 2015-11-19 19:28:14 +01:00
Yorick Peterse 9eefae6917 Fix UNION syntax for MySQL 
Apparently MySQL doesn't support this syntax:

    (...) UNION (...)

instead it only supports:

    ...
    UNION
    ...
 2015-11-18 13:31:18 +01:00
Yorick Peterse d769596aec Added Gitlab::SQL::Union class 
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).
 2015-11-18 13:02:43 +01:00
Valery Sizov c67bafca31 Merge remote-tracking branch 'origin/master' into ce-to-ee 2015-11-16 17:05:47 +02:00
Valery Sizov f194f56538 fix tests 2015-11-16 16:54:13 +02:00
Marin Jankovski 14032d8eb1 Add support for git lfs. 2015-11-16 12:39:13 +01:00
Robert Speicher 6afca45028 Merge remote-tracking branch 'ce/master' into ce-to-ee 2015-11-13 12:34:34 -05:00
Dmitriy Zaporozhets 3c16fb93fc Move spec to proper place and fix unused variable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-13 09:45:21 +01:00
Yorick Peterse 7b5fd8742e Track the amount of times views are rendered 2015-11-09 14:29:10 +01:00
Yorick Peterse db46d49c0e Fixed Hash key style in Sherlock::Query spec 2015-11-09 14:29:10 +01:00
Yorick Peterse 265ef867ff Added specs and source documentation for Sherlock 2015-11-09 14:29:10 +01:00
Valery Sizov 93bcc9ca7f Merge remote-tracking branch 'origin/master' into ce_upsteram 2015-11-05 14:26:35 +02:00
Valery SizovandValery Sizov 9479496f75 Add added, modified and removed properties to commit object in webhook 2015-11-03 12:16:40 +02:00
Douwe Maan 329e067ff1 Merge branch 'rs-dev-issue-2613' into 'master' 
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
 2015-11-02 10:49:46 +00:00
Douwe Maan b6f8d0100e Merge branch 'dirceu/gitlab-ce-fix-project-search-with-unmatched-parentheses' 2015-10-25 11:55:14 +01:00
Douwe MaanandValery Sizov b3314704d1 Update ExternalIssueReferenceFilter. 2015-10-23 17:55:16 +02:00
Valery Sizov 0f30be02eb Merge remote-tracking branch 'origin/master' into ce_upstream 2015-10-23 13:01:19 +02:00
Stan Hu 69e5e260b0 Add spec for cloning Wiki over HTTP 2015-10-22 14:16:37 -07:00
Dirceu Pereira Tiegs d7bcfe4fc0 Fix issue #3055 (project search with unmatched parentheses) 2015-10-21 10:20:40 -02:00
Valery Sizov 8766c54bf2 Merge remote-tracking branch 'origin/master' into ce_upstream_15_10 2015-10-15 16:46:48 +03:00
Douwe Maan 95f0440a78 Merge branch 'master' into rs-redactor-filter 2015-10-15 11:26:58 +02:00
Valery Sizov 8f584d5f2c Fix: Images cannot show when projects' path was changed 2015-10-14 18:50:35 +03:00
Douwe Maan 61d8f96176 Fix specs 2015-10-14 13:46:17 +02:00
Douwe Maan 93fcddd7a7 Allow ReferenceExtractor to efficiently load references from multiple texts at once 2015-10-13 22:53:05 +02:00
Robert Speicher 42603af326 Merge branch 'fix_email_downcasing' into 'master' 
LDAP email address downcasing

Fixes #2960

In the event we cannot match an LDAP user by DN we attempt to find an identity by email address and then update the DN. In this case the identity is matched by email address. 

If the user's email address in LDAP has an upper case character we cannot find a match in the GitLab database. GitLab downcases emails before the user object is saved.

This merge request downcases the email from LDAP before we lookup by email. I also added a test to prevent a regression.

See merge request !1550
 2015-10-11 22:53:11 +00:00
Robert Speicher 69b41ba043 Normalize space-like characters in keys before output to gitlab-shell 
gitlab-shell expects only one tab separator per key, and an SSH key with
a tab character in the comment, for example, would break things.

Closes #2970
 2015-10-08 20:34:50 -04:00
Drew Blessing b7def88c02 Fix ldap email downcasing bug 2015-10-08 14:59:46 -05:00
Yorick Peterse 85c6a3743a Added methods for detecting MySQL/PostgreSQL 
These two methods remove the need for manually going into
ActiveRecord::Base.connection all over the place.
 2015-10-07 23:32:14 +02:00
Douwe Maan 72afcbcd37 Always allow references to the current project 2015-10-07 19:19:23 +02:00
Douwe Maan f42cfa9e87 Refactor reference gathering to use a dedicated filter 2015-10-07 17:00:48 +02:00
Douwe Maan 4f629dab2a Merge branch 'master' into rs-redactor-filter 2015-10-07 15:15:35 +02:00
Guilherme Garnier aed145a9c6 Fix rubocop warnings in spec/lib and spec/tasks 2015-10-03 16:02:21 -05:00
Robert Speicher 16f8ca566b Add custom protocol whitelisting to SanitizationFilter 
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2613
 2015-10-01 23:40:29 -04:00
Kamil Trzcinski 04c4445ae0 Test grace auth against gitlab_ci_project with token 2015-09-24 20:19:27 +02:00
Robert Speicher ce19e1739e Update stub syntax 2015-09-24 14:12:25 -04:00
Kamil Trzcinski 5d69bc656a Fix grack auth spec 2015-09-24 17:47:57 +02:00