Commits · 61c651d7e235d162046dd574104eee759f66cab2 · nexedi / gitlab-ce

20 Jun, 2014 5 commits
- Merge branch 'git-hooks-docs' into 'master' · 61c651d7
  Sytse Sijbrandij authored Jun 20, 2014
```
Add documentation for EE Git Hooks feature

Fixes #99
```
  61c651d7
- Add link to git hooks doc from read me · 804008f1
  Dmitriy Zaporozhets authored Jun 20, 2014
  
  804008f1
- Spell fix · 3de79957
  Dmitriy Zaporozhets authored Jun 20, 2014
  
  3de79957
- Merge branch '7.0-ce-to-ee' into 'master' · b7d095cf
  Dmitriy Zaporozhets authored Jun 20, 2014
```
Add 7.0 ce to ee guide
```
  b7d095cf
- Add 7.0-ce-to-ee guide · 88200cfb
  Jacob Vosmaer authored Jun 20, 2014
  
  88200cfb
19 Jun, 2014 6 commits
- more spelling fixes · 702eb461
  Dmitriy Zaporozhets authored Jun 19, 2014
  
  702eb461
- More spelling fixes · 5e130138
  Dmitriy Zaporozhets authored Jun 19, 2014
  
  5e130138
- newline on every sentence + fixes · 9bd8aac1
  Dmitriy Zaporozhets authored Jun 19, 2014
  
  9bd8aac1
- Add 6.9.4-ee packages with Postgres security fix · e677ef34
  Jacob Vosmaer authored Jun 19, 2014
  
  e677ef34
- Merge remote-tracking branch 'ce/master' · 48481906
  Marin Jankovski authored Jun 19, 2014
```
Conflicts:
	VERSION
	doc/install/installation.md
```
  48481906
- Merge branch 'revert_email_thread' into 'master' · b6435147
  Dmitriy Zaporozhets authored Jun 19, 2014
```
Revert email threading rewrite

The 'to:' address introduced by this merge caused a flood of email going to an admin account for GitLab.com. This feature should not be shipped as-is.
```
  b6435147
18 Jun, 2014 18 commits
- More explanation for git_hooks feature · 58ff82c8
  Dmitriy Zaporozhets authored Jun 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  58ff82c8
- Explain Git Hooks feature · 0c8882f9
  Dmitriy Zaporozhets authored Jun 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0c8882f9
- Fix tab highlight for git_hooks page · 9ef18978
  Dmitriy Zaporozhets authored Jun 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9ef18978
- Merge pull request #7146 from zzet/patch-11 · 67934145
  Dmitriy Zaporozhets authored Jun 18, 2014
```
Fix mistake in reference_jira_issue method (markdown)
```
  67934145
- Revert "Merge branch 'fix-email-threading' into 'master'" · 780d868f
  Jacob Vosmaer authored Jun 18, 2014
```
This reverts commit 97fd990e, reversing
changes made to f451a697.

Conflicts:
	app/mailers/emails/notes.rb
	app/mailers/emails/projects.rb
```
  780d868f
- Merge branch 'show-them' into 'master' · c1ff1fde
  Dmitriy Zaporozhets authored Jun 18, 2014
```
Improve the spelling on the project settings page
```
  c1ff1fde
- Spelling, needs to end the sentence. · ca1248fb
  Sytse Sijbrandij authored Jun 18, 2014
  
  ca1248fb
- Spelling, you're showing the settings. · af67d58f
  Sytse Sijbrandij authored Jun 18, 2014
  
  af67d58f
- Merge branch '7-0-update-guide' into 'master' · ffa009dc
  Dmitriy Zaporozhets authored Jun 18, 2014
```
7.0 update guide
```
  ffa009dc
- Update guide from 6.9 to 7.0 · f299301c
  Dmitriy Zaporozhets authored Jun 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f299301c
- Merge branch 'update-guide-7-0' into 'master' · 840e98ba
  Dmitriy Zaporozhets authored Jun 18, 2014
```
Installation guide for 7.0

* Changed branch to 7-0-stable
* Bump gitlab-shell version to 1.9.6
```
  840e98ba
- Merge branch 'branded_login_page_documentation' into 'master' · 39100513
  Dmitriy Zaporozhets authored Jun 18, 2014
```
Branded login page documentation
```
  39100513
- Bump shell version · 2b6b07f3
  Dmitriy Zaporozhets authored Jun 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2b6b07f3
- Add branded login page doc to the main documentation README> · 2592159c
  Marin Jankovski authored Jun 18, 2014
  
  2592159c
- Point to 7-0-stable in installation docs · 8f8a6bf2
  Dmitriy Zaporozhets authored Jun 18, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8f8a6bf2
- Move the branded login page documentation to customization directory. · 300b7c19
  Marin Jankovski authored Jun 18, 2014
  
  300b7c19
- Add branded login page documentation. · 0c51f13a
  Marin Jankovski authored Jun 18, 2014
  
  0c51f13a
- Fix mistake in reference_jira_issue method · 45f9d15c
  Andrew Kumanyaev authored Jun 18, 2014
```
Use local variable instead global
```
  45f9d15c
17 Jun, 2014 8 commits

Add Marvin Frick (SinnerSchrader) to CHANGELOG-EE · 6addc8c1
Jacob Vosmaer authored Jun 17, 2014

6addc8c1

7.0.0.rc1 · 70ed6ef2

Dmitriy Zaporozhets authored Jun 17, 2014

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

70ed6ef2

Merge branch 'ce-7-to-ee' into 'master' · 68b32f3b
Dmitriy Zaporozhets authored Jun 17, 2014
```
Pull recent master from CE into EE

Fixes #113
```
68b32f3b
remove duplicate steps · 30654f8d
Dmitriy Zaporozhets authored Jun 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
30654f8d
Fix 500 on appearance page · 216e5fca
Dmitriy Zaporozhets authored Jun 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
216e5fca

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee · b165b097

Dmitriy Zaporozhets authored Jun 17, 2014

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb

b165b097

Change gravatar tests to identicon · e44e2316
Dmitriy Zaporozhets authored Jun 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
e44e2316
Enable identicon for gravatar by default · 7be80fd8
Dmitriy Zaporozhets authored Jun 17, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
7be80fd8

16 Jun, 2014 3 commits
- Replace ok with circle for boolean icon · 085a93d4
  Dmitriy Zaporozhets authored Jun 16, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  085a93d4
- Merge branch 'consistent-headers' into 'master' · 6a73124d
  Dmitriy Zaporozhets authored Jun 16, 2014
```
Consistent headers
```
  6a73124d
- Merge branch 'kanban-fixes' into 'master' · 547ea3c8
  Dmitriy Zaporozhets authored Jun 16, 2014
```
Kanban improvements

When drag from unassigned to assigned column - issue assignee avatar updated
```
  547ea3c8