Commits · c937d06c3c98e9ffce8ec1132203eaff6bf7b231 · Kazuhiko Shiozaki / gitlab-ce

29 Apr, 2012 1 commit
- Task#755 auto-merge don`t work correctly. · c937d06c
  Zevs authored Apr 30, 2012
  
  c937d06c
26 Apr, 2012 8 commits
- MR: change path to lock file · 903f9491
  Valery Sizov authored Apr 27, 2012
  
  903f9491
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · ff8136cd
  Valery Sizov authored Apr 27, 2012
  
  ff8136cd
- Task #735 Automerge should not be checked on every load of MR show page · 43dcc957
  Valery Sizov authored Apr 27, 2012
  
  43dcc957
- Hooks UI improved, Request tests added · 28cb4313
  Dmitriy Zaporozhets authored Apr 26, 2012
  
  28cb4313
- Merge pull request #743 from qqshfox/fix_issue_742 · 91bd8fc9
  Dmitriy Zaporozhets authored Apr 26, 2012
```
fix #742
```
  91bd8fc9
- fix #742 · c71222ba
  Hanfei Shen authored Apr 26, 2012
  
  c71222ba
- Merge pull request #741 from mgesmundo/master · 7b7547aa
  Dmitriy Zaporozhets authored Apr 26, 2012
```
Cosmetic change in menu
```
  7b7547aa
- Cosmetic change in menu · 7c59722d
  mgesmundo authored Apr 26, 2012
  
  7c59722d
24 Apr, 2012 8 commits
- Merge pull request #732 from mmozuras/ldap_name_utf8 · f72a5d11
  Valeriy Sizov authored Apr 24, 2012
```
Force utf-8 encoding for ldap omniauth_info.name
```
  f72a5d11
- Home button should targeted on root page of context · 2746be6c
  Dmitriy Zaporozhets authored Apr 24, 2012
  
  2746be6c
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · b5fdacd1
  gitlabhq authored Apr 24, 2012
  
  b5fdacd1
- New project page improved. User profile improved. Show issues, participant on Milestone show page. · c9af8e75
  gitlabhq authored Apr 24, 2012
  
  c9af8e75
- Merge pull request #704 from tader/workaround-charlock-holmes · bbb93de1
  Dmitriy Zaporozhets authored Apr 24, 2012
```
Rescue from CharlockHolmes failures.
```
  bbb93de1
- Rescue from CharlockHolmes failure · b53df221
  Thomas A. de Ruiter authored Apr 24, 2012
  
  b53df221
- Force utf-8 encoding for ldap omniauth_info.name · 03cc55db
  mmozuras authored Apr 24, 2012
  
  03cc55db
- Merge pull request #726 from kvs/patch-1 · af99e4af
  Ariejan de Vroom authored Apr 23, 2012
```
Fix very minor spelling issue.
```
  af99e4af
23 Apr, 2012 3 commits
- Fix very minor spelling issue. · 01bb42ae
  Kenneth Vestergaard authored Apr 23, 2012
  
  01bb42ae
- fixed email markdown · d97a9aa4
  gitlabhq authored Apr 23, 2012
  
  d97a9aa4
- Make sure tmp/merge_repo is available to write lock files for auto-merge. · 21f3da23
  Ariejan de Vroom authored Apr 23, 2012
  
  21f3da23
22 Apr, 2012 5 commits
- corrected exception for automerge · 204c6646
  Dmitriy Zaporozhets authored Apr 22, 2012
  
  204c6646
- Merge pull request #713 from gitlabhq/fast_automerge · 511d07c4
  Dmitriy Zaporozhets authored Apr 22, 2012
```
Fast automerge
```
  511d07c4
- fast automerge: done · e5f8397f
  Valery Sizov authored Apr 22, 2012
  
  e5f8397f
- logo changed for header · 71819dc3
  Dmitriy Zaporozhets authored Apr 22, 2012
  
  71819dc3
- fast automerge: base implementation · dcbb875c
  Valery Sizov authored Apr 22, 2012
  
  dcbb875c
21 Apr, 2012 4 commits
- Increased automerge timeout. Works for 300 commits MR on repo with 200MB size · ae565d24
  Dmitriy Zaporozhets authored Apr 21, 2012
  
  ae565d24
- Fixed db_schema & reordered rake tasks · 7058258a
  Dmitriy Zaporozhets authored Apr 21, 2012
  
  7058258a
- Merge remote-tracking branch 'origin/merge_button' · 08994f3f
  Dmitriy Zaporozhets authored Apr 21, 2012
```
Conflicts:
	app/assets/javascripts/merge_requests.js
	db/schema.rb
```
  08994f3f
- VERSION to 2.4.0 · 9af14e4b
  Dmitriy Zaporozhets authored Apr 21, 2012
  
  9af14e4b
20 Apr, 2012 11 commits
- linguist gitlab fork · 8d02d8c0
  Dmitriy Zaporozhets authored Apr 21, 2012
  
  8d02d8c0
- Merge branch 'master' of github.com:gitlabhq/gitlabhq into... · 7c8fbe8f
  Dmitriy Zaporozhets authored Apr 21, 2012
```
Merge branch 'master' of github.com:gitlabhq/gitlabhq into arthurschreiber-use_redcarpet_for_markdown
```
  7c8fbe8f
- Merge branch 'use_redcarpet_for_markdown' of... · 9cb51c6e
  Dmitriy Zaporozhets authored Apr 21, 2012
```
Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-use_redcarpet_for_markdown

Conflicts:
	Gemfile
	Gemfile.lock
```
  9cb51c6e
- Merge pull request #709 from blueyed/master · 680ee045
  Dmitriy Zaporozhets authored Apr 20, 2012
```
Fix typo: "less then" => "less than"
```
  680ee045
- Project linguist integration · 9c76bd95
  Dmitriy Zaporozhets authored Apr 21, 2012
  
  9c76bd95
- Fix typo: "less then" => "less than". · c851639a
  Daniel Hahler authored Apr 20, 2012
  
  c851639a
- Using github's linguist to better detect filetypes and to do syntax highlighting. · 5b6019f3
  Arthur Schreiber authored Apr 20, 2012
  
  5b6019f3
- Switch to Redcarpet for Markdown Rendering. · c437e2d7
  Arthur Schreiber authored Apr 17, 2012
```
This gives us Github Flavored Markdown, which is awesome.
```
  c437e2d7
- fixed admin root path for header · 9ee34575
  Dmitriy Zaporozhets authored Apr 20, 2012
  
  9ee34575
- Admin dashboard · 35e21b34
  randx authored Apr 20, 2012
  
  35e21b34
- Pagination and better perfomance for projects page. · 1d601616
  randx authored Apr 20, 2012
  
  1d601616