Commits · d97a9aa4a44ff9f452144fad348fd9d7e3b48260 · nexedi / gitlab-ce

23 Apr, 2012 2 commits
- 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 12 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
- Merge pull request #698 from Sindacious/master · 60bf502b
  Dmitriy Zaporozhets authored Apr 20, 2012
```
Display Milestones without a due date as active
```
  60bf502b
19 Apr, 2012 5 commits
- Use try for commit prev_commit_id detection · 18454292
  Dmitriy Zaporozhets authored Apr 19, 2012
  
  18454292
- Fix an issue with MR unavailable if remove source branch · 45b18365
  Dmitriy Zaporozhets authored Apr 19, 2012
  
  45b18365
- display milestones that are not marked with a due date as active · 69fd4763
  James Newton authored Apr 19, 2012
  
  69fd4763
- Merge pull request #696 from CodeBlock/patch-1 · ac3c23f9
  Dmitriy Zaporozhets authored Apr 19, 2012
```
Fix a few grammatical mistakes in profile view.
```
  ac3c23f9
- Fix a few grammatical mistakes in profile view. · 3f1a004c
  Ricky Elrod authored Apr 19, 2012
  
  3f1a004c
18 Apr, 2012 4 commits
- Merge pull request #687 from fixe/label-typo · ea818346
  Dmitriy Zaporozhets authored Apr 17, 2012
```
Fixed typo in label
```
  ea818346
- Merge pull request #686 from fixe/patch-1 · e52cb32f
  Dmitriy Zaporozhets authored Apr 17, 2012
```
Fixed typo
```
  e52cb32f
- Fixed typo in label · 8b5ef3c2
  Tiago Ribeiro authored Apr 18, 2012
  
  8b5ef3c2
- Fixed typo · 4e97ac2e
  Tiago Ribeiro authored Apr 18, 2012
  
  4e97ac2e
17 Apr, 2012 4 commits
- MR commits suppressed if too many. few icons · 5ef3b384
  Dmitriy Zaporozhets authored Apr 17, 2012
  
  5ef3b384
- Milestone filter for issues improved · 3b7998e1
  Dmitriy Zaporozhets authored Apr 17, 2012
  
  3b7998e1
- fixed app crash on new issue via get · ac7bb206
  Dmitriy Zaporozhets authored Apr 17, 2012
  
  ac7bb206
- 1. Improved admin -> new project form · 3250a024
  Dmitriy Zaporozhets authored Apr 17, 2012
```
2. Fixed bug: post-receive file was not added when create project via admin
```
  3250a024
16 Apr, 2012 4 commits
- Issues form improved, Show milestone for Issue show · f1795a49
  Dmitriy Zaporozhets authored Apr 17, 2012
  
  f1795a49
- Auto-merge: reise exception when gitlab do not have access to repo · 3a6694b5
  Valery Sizov authored Apr 16, 2012
  
  3a6694b5
- Auto-merge: implemented lock file · 5abbada4
  Valery Sizov authored Apr 16, 2012
  
  5abbada4
- User blocking improved. Admin area styled · c9def945
  Dmitriy Zaporozhets authored Apr 16, 2012
  
  c9def945