Commit Graph
3194 Commits
Author SHA1 Message Date
Stan Hu a429eb4d45 Merge branch 'fix-session_expire_delay' into 'master'
read session_expire_delay from database if table & column exists;

Previous code only ends up using the default value for session_expire_delay, not the value stored in the database, making the session always 1 week.

See merge request !1217
2015-08-28 07:55:51 +00:00
Eric Maziade 23aee0ca8a fixed connection detection so settings can be read from the database 2015-08-27 21:21:31 -04:00
Robert Speicher 9bb06ae9ef Make sure the main Gitlab::Markdown module gets loaded before filters 2015-08-27 16:02:49 -07:00
Robert Speicher 8e7111f79d Reference filters no longer take a custom class context option 2015-08-27 15:36:26 -07:00
Robert Speicher 4340dd3eeb Decouple Gitlab::Markdown from the GitlabMarkdownHelper
This module is now the sole source of knowledge for *how* we render
Markdown (and GFM).
2015-08-27 14:17: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
Douwe Maan 843694f902 Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-08-26 17:53:31 -07:00
Douwe Maan 6afd69f444 Update gitignore, change literal DB table names, fix errors, fix fontawesome 2015-08-26 17:47:18 -07:00
Robert Speicher 2d72efcd9f Add count to Themes and ColorSchemes 2015-08-26 11:30:38 -07:00
Robert Speicher 6d43308b5a Add Gitlab::Themes.for_user 2015-08-26 11:30:11 -07:00
Douwe Maan 046b283127 Groundwork for merging CI into CE 2015-08-25 18:42:46 -07:00
Robert Speicher 2c3e42e4a4 Remove user_color_scheme_class
Instead of rendering this value server-side, we use Javascript and Gon
to apply the user's color scheme (or the default) to any syntax
highlighted code blocks.

This will make it easier to cache these blocks in the future because
they're no longer state-dependent.
2015-08-25 15:32:38 -07: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
Douwe Maan 02e7b00a54 Fix init script for Reply by email 2015-08-25 12:03:58 -07:00
Valery Sizov 56527b63e8 Ability to search milestones 2015-08-24 13:59:01 +03: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
Stan Hu d241c6d057 Restrict users API endpoints to use integer IDs
Closes #2267
2015-08-23 06:13:16 -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 0366655311 Fix check task for development. 2015-08-21 15:06:04 -07:00
Douwe Maan 50baa1fdd1 Add development section to doc. 2015-08-21 15:03:16 -07:00
Douwe Maan 1cfc4af31e Merge branch 'rs-dev-issue-2550' into 'master'
Remove trailing HTML entities from non-Rinku autolinks as well.

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2550

See merge request !1179
2015-08-21 18:48:18 +00: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 f5b3bf84ad Merge branch 'fix-backup-restore' into 'master'
Do not delete the SQL dump too early

The change in baa157926d broke backup
restore fucnctionality. This would not lead to data loss, but it
prevented the restore script from working. This bug exists only in
7.14.0 release candidate versions, not in 7.13.

Reported in https://github.com/gitlabhq/gitlabhq/issues/9571 .

See merge request !1182
2015-08-21 16:10:12 +00:00
Jacob Vosmaer 4cd06867c7 Do not delete the SQL dump too early
The change in baa157926d broke backup
restore fucnctionality. This would not lead to data loss, but it
prevented the restore script from working. This bug exists only in
7.14.0 release candidate versions, not in 7.13.

Reported in https://github.com/gitlabhq/gitlabhq/issues/9571 .
2015-08-21 16:12:46 +02:00
Jacob Vosmaer bd78e1a2e9 Merge pull request #9535 from bbodenmiller/patch-3
check upload dir permissions
2015-08-21 14:30:58 +02:00
Robert Speicher 747fe7520b Remove trailing HTML entities from non-Rinku autolinks as well. 2015-08-20 18:25:16 -07:00
Douwe Maan 35224d5e7f Memoize address_regex locally. 2015-08-20 16:44:44 -07:00
Douwe Maan 3d141d1512 Fix spec by removing global state. 2015-08-20 16:21:31 -07:00
Douwe Maan 99ef8c8159 Fix markdown specs. 2015-08-20 15:37:43 -07:00
Douwe Maan f26c2905d1 Fix indentation 2015-08-20 14:25:56 -07:00
Douwe Maan 41ed60c21a Fix MailRoom running check. 2015-08-20 14:09:37 -07:00
Douwe Maan 123af78561 Add gitlab:reply_by_email:check rake task. 2015-08-20 14:03:04 -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 2f78b5e8af Make error class names more consistent. 2015-08-20 11:33:18 -07:00
Douwe Maan 0b401f2e94 Fix a couple of whoopsy daisies. 2015-08-20 11:17:14 -07:00
Douwe Maan e9972efc2f Extract ReplyParser and AttachmentUploader from Receiver. 2015-08-20 11:05:06 -07:00
Artem Sidorenko 55dca86b98 Import sources: settings in the admin interface 2015-08-20 11:28:27 +02:00
Douwe Maan 83081f1673 Start on tests. 2015-08-19 18:00:13 -07:00
Douwe Maan 9501495aeb Fix init.d script. 2015-08-19 17:43:24 -07:00
Douwe Maan 1202875dff Fix lib/support/init.d/gitlab. 2015-08-19 14:54:30 -07:00
Douwe Maan f3b57ce677 Update init scripts. 2015-08-19 13:58:07 -07:00
Douwe Maan 76dbafba86 Send a rejection email when the incoming email couldn't be processed. 2015-08-19 11:10:21 -07:00
Douwe Maan ee1eb2948d Turn reply-by-email attachments into uploads. 2015-08-19 10:18:05 -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
Stan Hu e56fd693ee Merge pull request #9567 from bigsurge/bigsurge-patch-1
add CommitNote field expose :created_at
2015-08-19 00:23:17 -07:00
bigsurge cecc18616a add CommitNote field expose :created_at
add CommitNote field expose :created_at
2015-08-19 14:29:18 +08:00
Douwe Maan 8906cabae7 Changes and stuff. 2015-08-18 17:02:26 -07:00