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,132 Commits 48 Branches 340 Tags
docker-updates
Commit Graph
292 Commits
Author SHA1 Message Date
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
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
Robert Speicher 619f04c196 Allow relative links to go up one directory level 2015-09-18 14:03:42 -04:00
Valery SizovandKamil Trzcinski a0c1a12dee remove API calls from CE to CI 2015-09-18 18:02:11 +02: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
Stan Hu 267687993a Add comments and clean up test for !1274 2015-09-10 14:24:10 -07: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 c52fee70d0 Test overriding LDAP attributes 2015-09-09 11:51:40 +01: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
Douwe Maan afb2e6f485 Merge branch 'rs-cleanup-redcarpet-renderer' into 'master' 
Decouple Gitlab::Markdown from the GitlabMarkdownHelper

This module is now the sole source of knowledge for *how* we render
Markdown (and GFM).

See merge request !1223
 2015-09-01 20:13:44 +00:00
Stan Hu 2e9c922dd1 Fix bug where only the first 15 Bitbucket issues would be imported. 
Also fix a number of issues where author/reporter names were not available.
 2015-09-01 08:50:20 -07:00
Douwe Maan fe86c8dfbd Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993 2015-08-29 11:49:14 -07:00
Robert Speicher 8e7111f79d Reference filters no longer take a custom class context option 2015-08-27 15:36:26 -07:00
Douwe Maan 30555c1d24 Merge branch 'rs-remove-user-color-scheme-class' into 'master' 
Apply syntax highlighting to fenced code blocks client-side

Instead of applying the syntax highlighting scheme class to these blocks
server-side, we use Javascript and Gon to apply the user's color scheme
(or the default) client-side.

This will make it easier to cache these blocks in the future because
they're no longer state-dependent.

See merge request !1203
 2015-08-27 16:24:51 +00:00
Robert Speicher 4344b8d2d4 Add Gitlab::ColorSchemes module 
Very similar to Gitlab::Theme, this contains all of the definitions for
our syntax highlighting schemes.
 2015-08-25 15:32:38 -07:00
Robert Speicher 646c1f0324 Re-enable the "links with adjacent text" UserReferenceFilter spec 2015-08-24 18:56:01 -07:00
Stan Hu ed1d4fa477 Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab 
and request them each session. Pass these tokens to the project import data.

This prevents the need to encrypt these tokens and clear them in case they
expire or get revoked.

For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get
an Error 500 with no way to recover:

```
Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000
Processing by Import::BitbucketController#status as HTML
Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms)

NameError (uninitialized constant Import::BitbucketController::Unauthorized):
  app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized'
```

Closes #1871
 2015-08-23 09:23:44 -07:00
Robert Speicher f0bdf7f810 Merge branch 'reply-by-email' into 'master' 
Reply by email

Fixes #1360.

It's far from done, but _it works_.

See merge request !1173
 2015-08-22 00:00:08 +00:00
Douwe Maan 15fc7bd613 No HTML-only email please 2015-08-21 16:09:55 -07:00
Douwe Maan 69708dab9f Block blocked users from replying to threads by email. 2015-08-21 10:14:45 -07:00
Joel KoglinandJoel Koglin 4d2f36118a Issue #993: Fixed login failure when extern_uid changes 2015-08-21 09:36:27 -07:00
Robert Speicher 747fe7520b Remove trailing HTML entities from non-Rinku autolinks as well. 2015-08-20 18:25:16 -07:00
Douwe Maan 48e25a019a Add stub_reply_by_email_setting helper. 2015-08-20 13:21:22 -07:00
Douwe Maan 6110e175dc Use heredocs. 2015-08-20 13:10:55 -07:00
Douwe Maan 54b04f1c5b Add fixture_file helper. 2015-08-20 12:41:47 -07:00
Douwe Maan 2b5a2b8f39 Removed unused fixtures. 2015-08-20 12:29:03 -07:00
Douwe Maan 3d51a6d435 Merge branch 'master' into reply-by-email 2015-08-20 12:19:19 -07:00
Douwe Maan 8ec5fb138d Test Gitlab::Email::Receiver. 2015-08-20 12:17:59 -07:00
Douwe Maan 991c9f6fda Test Email::AttachmentUploader. 2015-08-20 11:33:35 -07:00
Douwe Maan e9972efc2f Extract ReplyParser and AttachmentUploader from Receiver. 2015-08-20 11:05:06 -07:00
Douwe Maan 83081f1673 Start on tests. 2015-08-19 18:00:13 -07:00
Douwe Maan 41fdd20c74 Test Gitlab::ReplyByEmail. 2015-08-19 16:05:58 -07:00
Dmitriy Zaporozhets 72a425fa66 Merge branch 'remove-satellites' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-19 09:52:39 +02:00
Robert Speicher 204914983a Merge branch 'fix-authhash-infinite-loop' into 'master' 
Fix infinite loop when SAML was incorrectly configured.

See merge request !1170
 2015-08-18 15:56:30 +00:00
Dmitriy Zaporozhets 798f2fe19f Merge branch 'mr-source-branch-clear-cache' into 'master' 
Clear cache to prevent listing deleted branches after MR removes source branch

Closes #2272

See merge request !1160
 2015-08-18 13:16:46 +00:00
Douwe Maan c16b1651f5 Fix infinite loop when SAML was incorrectly configured. 2015-08-17 16:39:22 -07:00
Douwe Maan c9920c422d Merge branch 'fix-backslashes-inline-diff' into 'master' 
Fix bug where backslashes in inline diffs could be dropped

This MR fixes a bug in inline diff generation causing backslashes to be dropped. For example, the input:

```
input.to_s.sub(/[\r\n].+/,'').sub(/\\[rn].+/, '').strip
```

The second backslash is dropped in the second `sub` statement:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/16e513894f7ecda1b111fe7d43e7f388/image.png)

With this fix, it looks like:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/90fd635a937a68f1b2403740ebc75e3a/image.png)

Closes #2253

See merge request !1143
 2015-08-17 23:33:36 +00:00
Dmitriy Zaporozhets 4a0fa27017 Merge branch 'master' into remove-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 11:41:53 +02:00
Stan Hu 6e808fc222 Clear cache to prevent listing deleted branches after MR removes source branch 
Closes #2272
 2015-08-14 07:09:25 -07:00
Ben Boeckel 013260e057 markup_helper: detect .mkd and .mkdn as markdown 2015-08-12 15:29:15 -04:00
Stan Hu c36adb98aa Fix bug where backslashes in inline diffs could be dropped 
Closes #2253
 2015-08-11 18:39:27 -07:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00
Robert Speicher fb6f8d9198 Merge branch 'rs-reference-data-attrs' into 'master' 
Add `data-[type]-id` attribute to reference links

This is to let us redact them later in another filter.

See merge request !1110
 2015-08-10 00:07:56 +00:00
Robert Speicher 32e63ba7a1 Add data-[type]-id attribute to reference links 
This is to let us redact them later in another filter.
 2015-08-08 16:43:29 -04:00
Robert Speicher fb6dc1f07d Add Group#add_* convenience methods 
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
 2015-08-07 00:20:02 -04:00
Dmitriy Zaporozhets 957e849f41 Merge branch 'drop-satellites' 2015-08-05 15:40:14 +02:00
Valery Sizov 6353ca9ae8 Revert "Update noteable after a new note is added" 
This reverts commit fbdaf0e2a5.
 2015-08-05 12:00:12 +03:00