Commits · 28e6e1b1ab22f50a700408fa0c43528cd13ad360 · Boxiang Sun / gitlab-ce

14 Apr, 2014 1 commit

Merge branch '161-emails-on-push-service' of... · 28e6e1b1

Dmitriy Zaporozhets authored Apr 14, 2014

Merge branch '161-emails-on-push-service' of https://gitlab.com/jsternberg/gitlab-ce into jsternberg/gitlab-ce-161-emails-on-push-service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG

28e6e1b1

13 Apr, 2014 10 commits
- Merge pull request #6731 from hiroponz/better-title-format-for-wiki-page · 352bb972
  Dmitriy Zaporozhets authored Apr 13, 2014
```
Better title format for wiki page
```
  352bb972
- Merge pull request #6699 from criteo/api_get_open_merge_requests · 53b52b11
  Dmitriy Zaporozhets authored Apr 13, 2014
```
Add optional parameter to list merge requests
```
  53b52b11
- Merge pull request #6766 from jvanbaarsen/split-test-even-further · 481bbd75
  Dmitriy Zaporozhets authored Apr 13, 2014
```
Split feature tests out to different build job
```
  481bbd75
- Merge pull request #6747 from mrts/expose-event-and-mergerequest-timestamps-in-api · 156465ce
  Dmitriy Zaporozhets authored Apr 13, 2014
```
Expose event and mergerequest timestamps in API
```
  156465ce
- Split feature tests out to different build job · 8362026a
  Jeroen van Baarsen authored Apr 12, 2014
  
  8362026a
- Merge pull request #6764 from BrettBukowski/classname-typo · 6d57acce
  Dmitriy Zaporozhets authored Apr 13, 2014
```
Fix "project-name" span classname typo
```
  6d57acce
- Merge pull request #6405 from awiddersheim/fix_space_in_commit_message · 5f9592e4
  Dmitriy Zaporozhets authored Apr 13, 2014
```
Fix extra space added in beginning of commit message
```
  5f9592e4
- Merge pull request #6765 from jvanbaarsen/fixed-missing-buid-option · d1547f86
  Dmitriy Zaporozhets authored Apr 13, 2014
```
Fixed a typo fix in the travis build
```
  d1547f86
- Merge branch 'is-it-amr' into 'master' · 5ff086b3
  Sytse Sijbrandij authored Apr 13, 2014
```
Is it amr
```
  5ff086b3
- AMR warning for merge requests officers. · d16bb8c0
  dosire authored Apr 13, 2014
  
  d16bb8c0
12 Apr, 2014 1 commit
- Fixed a typo fix in the travis build · 0fd26ea4
  Jeroen van Baarsen authored Apr 12, 2014
  
  0fd26ea4
11 Apr, 2014 10 commits
- Fix "project-name" span classname typo · c1c9e114
  Brett Bukowski authored Apr 11, 2014
  
  c1c9e114
- Merge pull request #6753 from jvanbaarsen/split_tests · 0f31acd0
  Dmitriy Zaporozhets authored Apr 11, 2014
```
Proposal for split testing
```
  0f31acd0
- Updated the travis script · 490ab228
  Jeroen van Baarsen authored Apr 11, 2014
  
  490ab228
- Added API testing group · 5dd2f36a
  Jeroen van Baarsen authored Apr 11, 2014
  
  5dd2f36a
- Merge pull request #6760 from jvanbaarsen/label-color-lowercase · 1942b97d
  Dmitriy Zaporozhets authored Apr 11, 2014
```
Determine label color based on lowercase name
```
  1942b97d
- Determine label color based on lowercase name · 28f1a5d7
  Jeroen van Baarsen authored Apr 11, 2014
  
  28f1a5d7
- Fix emails on push service when a single commit is pushed · 9cb2a4ac
  Jonathan A. Sternberg authored Apr 10, 2014
```
This fixes issue #161.
```
  9cb2a4ac
- Proposal for split testing · 25eadf0c
  Jeroen van Baarsen authored Apr 11, 2014
  
  25eadf0c
- Merge pull request #6749 from cirosantilli/where-to-contrib · 4881d493
  Sytse Sijbrandij authored Apr 11, 2014
```
Say on CONTRIBUTING that issues are accepted at both gitlab and github.
```
  4881d493
- Say issues are accepted at both gitlab and github. · def67592
  Ciro Santilli authored Apr 11, 2014
  
  def67592
10 Apr, 2014 11 commits

Expose event and and mergerequest timestamps in API, make code more DRY. · 0da8428f
Mart Sõmermaa authored Apr 09, 2014

0da8428f
Merge pull request #6741 from dblessing/omniauth_docs · 731c009a
Sytse Sijbrandij authored Apr 10, 2014
```
Add OmniAuth Documentation
```
731c009a

Add OmniAuth Documentation · 728b05ca

Drew Blessing authored Apr 02, 2014

Add GitHub OmniAuth docs

Google instructions

Google instructions

Merge master

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Add Google and Twitter docs

Add screenshot

Add screenshot

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Finalize current docs

Finalize current docs

Add existing user information

Add twitter

Add twitter

Add Twitter disclaimer

Add Twitter disclaimer

remove old doc

Remove unnecessary link

Revert omniauth provider format

Add OmniAuth Documentation

Add GitHub OmniAuth docs

Google instructions

Google instructions

Merge master

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Add Google and Twitter docs

Add screenshot

Add screenshot

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Clean things up

Finalize current docs

Finalize current docs

Add existing user information

Add twitter

Add twitter

Add Twitter disclaimer

Add Twitter disclaimer

remove old doc

Remove unnecessary link

Revert omniauth provider format

Use omniauth again

Remove notice

Restore whitespace

Slight changes

728b05ca

Fix download link for huge MR diffs · 415c0f4b
Dmitriy Zaporozhets authored Apr 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
415c0f4b
Fix avatars in the network graph for relative-url setups. · 5b123dbf
Thomas Moschny authored Apr 07, 2014

5b123dbf
Merge branch 'no-link-to-centos-guide' into 'master' · 5830d672
Dmitriy Zaporozhets authored Apr 10, 2014
```
No link to centos guide
```
5830d672
Remove the vmi's. · 355b1202
dosire authored Apr 10, 2014

355b1202
No capital letter for recommended. · 549758b3
dosire authored Apr 10, 2014

549758b3
Merge branch 'ensure_default_fields' into 'master' · 89ecb191
Dmitriy Zaporozhets authored Apr 10, 2014
```
Add values to default fields to prevent 500 error when migrate from MySQL to Postgres
```
89ecb191
Steer people to the packages since people encounter less errors installing those. · 670e0298
dosire authored Apr 10, 2014

670e0298

Better title format for wiki page · bca528a5

Hiroyuki Sato authored Apr 09, 2014

The title format for wiki page may be unintelligible.
For example 'GitLab' is converted to 'Git Lab', 'MySQL' is converted to
'My Sql', etc.

bca528a5

09 Apr, 2014 7 commits
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 03472b4f
  Dmitriy Zaporozhets authored Apr 09, 2014
  
  03472b4f
- Fix note body align · 77934172
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  77934172
- Merge pull request #6729 from hiroponz/fix-seed-fu · 5c9127ea
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Fix rake db:seed_fu ENV=development
```
  5c9127ea
- Reduce note header padding · fd8a165d
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  fd8a165d
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 67b07f96
  Dmitriy Zaporozhets authored Apr 09, 2014
  
  67b07f96
- Modify project default values · 9f6a8ff4
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9f6a8ff4
- Merge branch 'ensure_satellite_exists' into 'master' · f23dcac9
  Dmitriy Zaporozhets authored Apr 09, 2014
```
Ensure satellite exists instead of raising an error
```
  f23dcac9