home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 12:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,900 Commits 48 Branches 340 Tags
v8.1.4
Commit Graph
1135 Commits
Author SHA1 Message Date
Robert SpeicherandRobert Speicher e6e4aa04dc Merge branch 'facebook-auth' into 'master' 
Add Facebook authentication

See merge request !1740
 2015-11-04 10:40:52 -05:00
Robert SpeicherandRobert Speicher 7121834535 Merge branch 'fix-wiki-clone-over-http' into 'master' 
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
 2015-10-23 13:32:48 +02:00
Robert SpeicherandRobert Speicher 8fe4352eba Merge branch 'project-path-case-sensitivity' into 'master' 
Prefer project with exact path to differently cased one when both exist.

Fixes #3113.

See merge request !1649
 2015-10-22 15:05:54 +02:00
Robert SpeicherandRobert Speicher 5707aaf397 Merge branch 'hash-block-return' into 'master' 
Fix bug where a push would only create cross references from the first commit.

Apparently we can't `return` from a `Hash.new` block. Who knew.

See merge request !1638
 2015-10-19 11:19:26 +02:00
Douwe Maan d80a4d3c15 Merge branch 'rs-redactor-filter' into 'master' 
Separate rendering of Markdown reference links from redacting those the user doesn't have access to and extracting referenced objects

Related: !1014

See merge request !1090
 2015-10-17 13:57:22 +02:00
Douwe Maan 4b28f2d999 Merge branch 'git-archive-golang' into 'master' 
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
 2015-10-15 11:43:14 +00:00
Douwe Maan c993481d99 Merge branch 'master' into git-archive-golang 2015-10-15 11:47:36 +02:00
Robert Speicher 976400c1e6 Merge branch 'incoming-email-config' into 'master' 
Make Reply by email easier to configure

Builds on !1566.

Omnibus companion MR: gitlab-org/omnibus-gitlab!510 (cc @marin)

See merge request !1580
 2015-10-14 20:38:36 +00:00
Robert Speicher 123669a551 Merge branch 'simplify-cross-references' into 'master' 
Simplify code around (cross)-references

See merge request !1568
 2015-10-14 20:10:34 +00:00
Valery Sizov 8f584d5f2c Fix: Images cannot show when projects' path was changed 2015-10-14 18:50:35 +03:00
Douwe Maan 712d17684b Make Reply by email easier to configure 2015-10-13 13:10:49 +02:00
Douwe Maan b0164771ec Simplify code around (cross)-references 2015-10-12 11:54:46 +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
Jacob Vosmaer cb13980db8 Let gitlab-git-http-server handle archive downloads 
This change relies on changes in gitlab_git and gitlab-git-http-server.
 2015-10-08 17:12:00 +02: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
Guilherme Garnier 59d0263bc8 Fix rubocop warnings in lib 2015-10-03 01:29:58 -05:00
Dmitriy Zaporozhets e0609a7800 Merge branch 'show-diff-stats-for-mr' 2015-10-01 17:02:53 +02:00
Dmitriy Zaporozhets 0d967bce57 Show additions/deletions stats on merge request diff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-01 13:52:08 +02:00
Петров Роман e82b37a653 Add support of multibyte characters in LDAP UID 2015-09-30 13:47:50 +03:00
Stan Hu 4957415e00 Merge pull request #9650 from szechyjs/fb-close-comment 
FogBugz Import: Include closed comments since they may contain user data
 2015-09-25 16:46:50 -07:00
Douwe Maan 73a3df4de3 Fix LDAP attribute mapping 2015-09-23 16:37:59 +02:00
Robert Speicher d4acda1253 Merge branch 'rs-relative-link-up-one' into 'master' 
Allow relative links to go up one directory level

See merge request !1352
 2015-09-21 19:38:37 +00:00
Jared Szechy 4e2bb80fb3 FogBugz Import: Closed comments may contain user data 2015-09-21 10:49:44 -04:00
Douwe Maan ee028d9d60 Rename reply_by_email to incoming_email to prepare for the future. 2015-09-21 10:35:37 +02:00
Robert Speicher 2b94f5fb06 Allow RelativeLinkFilter to go up multiple directories 2015-09-20 19:21:33 -04:00
Douwe Maan 3377808193 Fix reply by email for comments on a specific line in a diff/commit. 2015-09-20 18:18:39 +02:00
Robert Speicher 619f04c196 Allow relative links to go up one directory level 2015-09-18 14:03:42 -04:00
Robert Speicher 09bcce7d1f Merge branch 'ldap-attributes' into 'master' 
Allow configuration of LDAP attributes GitLab will use for the new user account.

Fixes #2412.

See merge request !1261
 2015-09-16 18:34:55 +00:00
Douwe Maan 84d57bc703 Make code clearer 2015-09-16 09:14:04 +02:00
Dmitriy Zaporozhets e3c30bf2e8 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-11 16:32:11 +02:00
Douwe Maan 4f461fd45f Merge branch 'rs-fix-highlighting' into 'master' 
Syntax highlighting improvements

On the server side:

During development I would occasionally see SanitizationFilter sanitizing
the result of SyntaxHighlightFilter, even though its attributes were
whitelisted. This updates the `clean_spans` transformer to return the
whitelisted node as [suggested by the Sanitize docs](http://git.io/vZR8i).

On the client side:

- Makes the syntax_highlight JS more flexible
- Adds JS specs
- Simplifies highlighting of new notes
- Adds highlighting to Markdown preview

See merge request !1278
 2015-09-11 08:47:13 +00:00
Stan Hu 267687993a Add comments and clean up test for !1274 2015-09-10 14:24:10 -07:00
Robert Speicher e3c97ede96 RU-BO-COOOOOOOOP 2015-09-10 16:06:24 -04:00
Robert Speicher 7cbf5e4d18 Prevent result of SyntaxHighlightFilter being sanitized 2015-09-10 15:08:06 -04:00
Stan Hu 9d3344adbb Gracefully handle errors in syntax highlighting by leaving the block unformatted 
Closes #2433
 2015-09-10 09:16:27 -07:00
Douwe Maan 0d41b2dd87 Merge branch 'fix-emojis-relative-url' into 'master' 
Fix emoji URLs in Markdown when relative_url_root is used

Path/URL helpers (e.g. `asset_url_helper`) already include the relative_url_root, so there is no need to attach it twice.

Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example:

RELATIVE_URL_ROOT=/gitlab rspec

Closes #1728

See merge request !1254
 2015-09-09 14:53:14 +00:00
Dmitriy Zaporozhets 0b5d627cd4 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-09 14:56:02 +02:00
Dmitriy Zaporozhets 90c338a495 Move helpers back to original directory 2015-09-09 14:37:34 +02:00
Douwe Maan 909a8443c6 Shuffle config around a bit 2015-09-09 11:40:31 +01:00
Jared Szechy e156f42079 FogBugz project import 2015-09-08 20:23:01 -04:00
Douwe Maan 0e9ba0a4fa Add attributes to LDAP::Config. 2015-09-08 17:34:18 +01:00
Douwe Maan c915e2c823 Allow configuration of LDAP attributes GitLab will use for the new user account. 2015-09-08 16:18:14 +01:00
Stan Hu 8820785c8f Fix emoji URLs in Markdown when relative_url_root is used 
Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example:

RELATIVE_URL_ROOT=/gitlab rspec

Closes #1728
 2015-09-06 09:46:10 -07:00
Stan Hu a5314e79f2 Fix URL construction for merge requests, issues, notes, and commits for relative URL config 
Closes https://github.com/gitlabhq/gitlabhq/issues/9605
 2015-09-04 16:24:01 -07:00
Dmitriy Zaporozhets d9f794a850 Merge branch 'grack-auth-new-instance' into 'master' 
Avoid instance variable re-use trouble

This is the quickest/dumbest/safest way I could think of to prevent
the instance variable reuse problems we have on dev.gitlab.org now.

See merge request !1237
 2015-09-02 18:05:16 +00:00
Jacob Vosmaer 30bf2b9cc3 Avoid instance variable re-use trouble 
This is the quickest/dumbest/safest way I could think of to prevent
the instance variable reuse problems we have on dev.gitlab.org now.
 2015-09-02 18:47:56 +02:00
Kirilll Zaitsev 263abda3fd Drone CI service 2015-09-02 05:52:16 +03:00
Marin Jankovski 308c6428ae Merge branch 'use_db_for_application_settings' into 'master' 
Check if database connection exists when loading application settings

!1217 broke omnibus-gitlab nightly builds. In omnibus-gitlab we precompile assets without a running database.

See merge request !1230
 2015-09-01 21:14:57 +00:00