delta/gitlab/gitlab-ce.git/lib, branch improve-diff-header

Fix OAuth2 issue importing a new project from GitHub and GitLab

2015-03-23T01:16:48+00:00

Closes #1268

Merge branch 'disable-ref-generation-in-code-blocks' into 'master'

2015-03-22T23:36:07+00:00

Disable reference generation in preformatted/code blocks

### Summary

If a user adds text in code or preformatted text via Markdown or HTML that contains `#XXX`, the system adds a note that issue `XXX` was mentioned. This is particularly annoying because we often list gdb backtrace dumps into our issues, and many issues get mentioned as a result. For example:

```
(gdb) bt
#0  0x00000000004004c4 in second () at main.cc:6
#1  0x00000000004004d2 in first () at main.cc:11
#2  0x00000000004004dd in main () at main.cc:17
(gdb)
```

### Steps to reproduce

1. In an issue, write the above text using Markdown or HTML tags (e.g. ``, ``).
2. Observe that [issue 1](https://gitlab.com/gitlab-org/gitlab-ce/issues/1) and [issue 2](https://gitlab.com/gitlab-org/gitlab-ce/issues/2) have a note that says they were mentioned.

### Expected behavior

Everything enclosed in the code blocks should be ignored as references.

### Observed behavior

Issues get referenced unnecessarily.

### Fix

I've made `reference_extractor.rb` strip out HTML and Markdown blocks before processing. I considered running the raw text through the entire Markdown processor, but this seems overkill and perhaps could lead to some unintended side effects.

See merge request !365



Merge branch 'backup-permissions' into 'master'
2015-03-21T23:50:20+00:00

Change permissions on backup files - #2

Use more restrictive permissions for backup tar files and for the db, uploads, and repositories directories inside the tar files.  See #1894.  Now the backup task recursively `chmod`s the `db/`, `uploads/`, and `repositories/` folders with 0700 permissions, and the tar file is created as 0600.

This is a followup to !1703, which was reverted because it broke Rspec tests.  The test failures were due to the rake task changing directories and not changing back, which I fixed with this commit.

cc @sytse

See merge request !1716




Extend push_tag event to include tag message and last commit
2015-03-21T10:25:27+00:00





Call chdir() with a block
2015-03-20T02:30:19+00:00





Revert "Increase timeout for Git-over-HTTP requests."
2015-03-20T01:29:20+00:00

This reverts commit 516bcabbf42d60db2ac989dce4c7187b2a1e5de9.

Conflicts:
	Gemfile




Disable reference creation for comments surrounded by code/preformatted blocks
2015-03-19T21:37:35+00:00





Merge branch 'bugfix/block_ldap_users_cronjob' into 'master'
2015-03-19T21:09:25+00:00

Fixed rake task gitlab:cleanup:block_removed_ldap_users

Maybe not the most elegant solution, but it works for us.

This closes issue gitlab-org/gitlab-ce#955.

See merge request !338




Merge branch 'rake_backup' into 'master'
2015-03-19T15:54:53+00:00

Backup repo with tar instead of git bundle

Fixes gitlab/gitlab-ee#246

See merge request !1723




Merge branch 'fewer-constants-more-helpres' into 'master'
2015-03-19T15:53:43+00:00

Fewer Git constants, more Git helpers.

See merge request !1727