Commits · d40311a91d9a155dc25f87bbc719bb744ef78edc · iv / gitlab-ce

19 Sep, 2014 9 commits
- Merge pull request #7788 from bbodenmiller/patch-25 · d40311a9
  Robert Schilling authored Sep 19, 2014
```
link to page that discusses how to generate ssh key
```
  d40311a9
- Merge pull request #7797 from cirosantilli/zen-style · 9c08ce63
  Robert Schilling authored Sep 19, 2014
```
Improve zen mode internals.
```
  9c08ce63
- Improve zen mode internals. · 04ef3ddc
  Ciro Santilli authored Sep 19, 2014
  
  04ef3ddc
- Merge pull request #7791 from cirosantilli/patch-6 · c759b8c9
  Robert Schilling authored Sep 19, 2014
```
CONTRIBUTING typos.
```
  c759b8c9
- CONTRIBUTING typos. · eb819c1e
  Ciro Santilli authored Sep 19, 2014
  
  eb819c1e
- link to page that discusses how to generate ssh key · 9a1fe306
  Ben Bodenmiller authored Sep 19, 2014
  
  9a1fe306
- Merge pull request #7774 from bbodenmiller/patch-15 · 9790598b
  Robert Schilling authored Sep 19, 2014
```
standardize capitalization
```
  9790598b
- standardize capitalization · 9cad1cbe
  Ben Bodenmiller authored Sep 19, 2014
  
  9cad1cbe
- Merge pull request #7769 from bbodenmiller/patch-6 · ac516abe
  Robert Schilling authored Sep 19, 2014
```
update rack_attack link to history page
```
  ac516abe
18 Sep, 2014 13 commits
- update rack_attack link to history page · 2b1137bd
  Ben Bodenmiller authored Sep 18, 2014
  
  2b1137bd
- Merge pull request #7768 from PragTob/patch-1 · f56877a9
  Robert Schilling authored Sep 18, 2014
```
Delete stray brace
```
  f56877a9
- Delete stray brace · 0311efcb
  Tobias Pfeiffer authored Sep 18, 2014
```
* seems like a small mistake ;-)
```
  0311efcb
- Merge pull request #7767 from bbodenmiller/patch-6 · 9079441d
  Sytse Sijbrandij authored Sep 18, 2014
```
check resque.yml.example for config changes
```
  9079441d
- check resque.yml.example for config changes · c36b06e4
  Ben Bodenmiller authored Sep 18, 2014
  
  c36b06e4
- Merge branch 'ci-setup-doc' into 'master' · d8b8be44
  Dmitriy Zaporozhets authored Sep 18, 2014
```
CI setup doc

I want do describe what CI services we use

See merge request !1099
```
  d8b8be44
- Mention build script · c0cecdb0
  Dmitriy Zaporozhets authored Sep 18, 2014
  
  c0cecdb0
- CI setup docs · 175a9130
  Dmitriy Zaporozhets authored Sep 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  175a9130
- Merge branch 'security-in-dvcs' into 'master' · cc964969
  Job van der Voort authored Sep 18, 2014
```
Security in dvcs

Explain why access & sharing are the same.

See merge request !1097
```
  cc964969
- Add explanation about unintentional sharing. · 664b433a
  Sytse Sijbrandij authored Sep 18, 2014
  
  664b433a
- Add information on information exclusivity. · ff4a45ef
  Sytse Sijbrandij authored Sep 18, 2014
  
  ff4a45ef
- Merge pull request #7765 from bbodenmiller/patch-6 · 01c10175
  Marin Jankovski authored Sep 18, 2014
```
remove rack attack middleware update
```
  01c10175
- remove rack attack middleware update · 28ee311d
  Ben Bodenmiller authored Sep 17, 2014
```
Hasn't changed since 7.2 release: https://github.com/gitlabhq/gitlabhq/commits/master/config/initializers/rack_attack.rb.example
```
  28ee311d
17 Sep, 2014 4 commits
- Version 7.3.rc1. · 630d0424
  Marin Jankovski authored Sep 17, 2014
  
  630d0424
- Updates to the update/install docs for 7.3.rc1 · 2b35c887
  Marin Jankovski authored Sep 17, 2014
  
  2b35c887
- Highlight the word master when referring to a branch name to make it more obvious, thanks Ben. · 8952c5ce
  Sytse Sijbrandij authored Sep 17, 2014
  
  8952c5ce
- Merge branch 'doc/welcome_message' into 'master' · 553680d0
  Job van der Voort authored Sep 17, 2014
```
Document the extra.sign_in_text setting for CE

See merge request !1027
```
  553680d0
16 Sep, 2014 8 commits
- Merge branch 'gitlab_check_hooks_symlink' into 'master' · 39c47844
  Dmitriy Zaporozhets authored Sep 16, 2014
```
Check for hooks directory symlink in gitlab:check

See merge request !1094
```
  39c47844
- Merge branch 'dont-rebase-pushed-commits' into 'master' · 5104b6c8
  Dmitriy Zaporozhets authored Sep 16, 2014
```
Dont rebase pushed commits

/cc @jacobvosmaer

See merge request !1095
```
  5104b6c8
- Don't rebase pushed commits. · 5a14213f
  Sytse Sijbrandij authored Sep 16, 2014
  
  5a14213f
- Merge branch 'new_relic' into 'master' · 500a1a7b
  Dmitriy Zaporozhets authored Sep 16, 2014
```
Add dormant New Relic gem

See merge request !1089
```
  500a1a7b
- Add dormant New Relic gem · 66ae1bde
  Jacob Vosmaer authored Sep 12, 2014
```
The gem can be enabled and configured via environment variables.
```
  66ae1bde
- Check for hooks directory symlink in gitlab:check · 45a6b624
  Jacob Vosmaer authored Sep 16, 2014
  
  45a6b624
- Merge branch 'order_mr_api' into 'master' · 71e05544
  Marin Jankovski authored Sep 16, 2014
```
API MR ordering

Fixes #1477

See merge request !1076
```
  71e05544
- Fix typo in comment. · 685754b0
  Marin Jankovski authored Sep 16, 2014
  
  685754b0
15 Sep, 2014 5 commits
- Merge branch 'redis_socket' into 'master' · 892371bc
  Dmitriy Zaporozhets authored Sep 15, 2014
```
Use sockets to connect to Redis

See merge request !1088
```
  892371bc
- Different created_at and updated_at time in api merge_requests spec. · f37b4cc5
  Marin Jankovski authored Sep 15, 2014
  
  f37b4cc5
- Ordering and sorting for MR in api. · b99b2e60
  Marin Jankovski authored Sep 09, 2014
  
  b99b2e60
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 09b23228
  Dmitriy Zaporozhets authored Sep 15, 2014
  
  09b23228
- Merge branch 'implement_comments_on_parallel_diff' into 'master' · 79190fe0
  Dmitriy Zaporozhets authored Sep 15, 2014
```
Implement comments on parallel diff

Fixes #1565

See merge request !1090
```
  79190fe0
14 Sep, 2014 1 commit
- Merge pull request #7753 from tamers/patch-1 · 67cf376d
  Robert Schilling authored Sep 14, 2014
```
Fix grammatical error in 'not merged changes' msg
```
  67cf376d