Commit Graph
2986 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 243bf65124 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 17:15:12 +02: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
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
Douwe Maan 01b4bea018 Satisfy Rubocop 2015-08-21 09:29:11 -07:00
Douwe Maan 6ff10340e5 Merge branch 'cernvcs/gitlab-ee-feature/kerberos_auth_for_git_access' 2015-08-21 09:15:48 -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 067673fbe7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into master-ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19 11:13:30 +02: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
Douwe Maan f76eac56b9 Reply by email POC 2015-08-18 15:46:36 -07: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
Robert Speicher 04e1c4d3da Merge branch 'fix-rake-info' into 'master'
Fix gitlab:env:info rake task.

Found doing QA.

See merge request !1169
2015-08-18 15:47:38 +00:00
Dmitriy Zaporozhets 9bf7bd27fa Merge branch 'kalibyrn/gitlab-ee-downcase-emails-for-hook'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-18 15:38:02 +02:00
Dmitriy Zaporozhets aa0d65818f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee 2015-08-18 15:35:31 +02:00
Dmitriy Zaporozhets 00b9c9e934 Merge branch 'improve-hook-messages' into 'master'
Include more information in hook error messages

When pushing commits to the remote, if a pre-receive hook gets triggered that prevents the push, it may not be clear which commit is causing the issue. Having the values of what caused the comparison to fail in the error message will help debugging, whether it be the user or the administrator.

See merge request !14
2015-08-18 13:33:37 +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 262c6f11fe Merge branch 'rs-remove-gfm_with_options' into 'master'
Remove the `gfm_with_options` helper

It was redundant because `gfm` also took options.

See merge request !1152
2015-08-17 23:42:29 +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
Douwe Maan 0f2616b365 Merge branch 'ldap-group-links-api-doc-fix' into 'master'
Make the `provider` argument for the LDAP group links API endpoint required

Related to #329

If no `provider` is passed to the API endpoint, the group link is not created properly. Making it required fixes the issue temporarily. It should default to the first provider.

Next step, as mentioned in #329, is to do that.

/cc @job

See merge request !475
2015-08-17 23:24:30 +00:00