Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixed email markdownv2.4.1 | gitlabhq | 2012-04-23 | 6 | -4/+22 |
| | |||||
* | Make sure tmp/merge_repo is available to write lock files for auto-merge. | Ariejan de Vroom | 2012-04-23 | 1 | -2/+6 |
| | |||||
* | corrected exception for automergev2.4.0 | Dmitriy Zaporozhets | 2012-04-22 | 1 | -1/+1 |
| | |||||
* | Merge pull request #713 from gitlabhq/fast_automerge | Dmitriy Zaporozhets | 2012-04-22 | 5 | -11/+67 |
|\ | | | | | Fast automerge | ||||
| * | fast automerge: done | Valery Sizov | 2012-04-22 | 5 | -21/+52 |
| | | |||||
| * | fast automerge: base implementation | Valery Sizov | 2012-04-22 | 4 | -11/+36 |
| | | |||||
* | | logo changed for header | Dmitriy Zaporozhets | 2012-04-22 | 3 | -2/+13 |
|/ | |||||
* | Increased automerge timeout. Works for 300 commits MR on repo with 200MB size | Dmitriy Zaporozhets | 2012-04-21 | 1 | -14/+18 |
| | |||||
* | Fixed db_schema & reordered rake tasks | Dmitriy Zaporozhets | 2012-04-21 | 4 | -12/+16 |
| | |||||
* | Merge remote-tracking branch 'origin/merge_button' | Dmitriy Zaporozhets | 2012-04-21 | 13 | -7/+223 |
|\ | | | | | | | | | | | Conflicts: app/assets/javascripts/merge_requests.js db/schema.rb | ||||
| * | Auto-merge: reise exception when gitlab do not have access to repo | Valery Sizov | 2012-04-16 | 1 | -1/+3 |
| | | |||||
| * | Auto-merge: implemented lock file | Valery Sizov | 2012-04-16 | 1 | -8/+13 |
| | | |||||
| * | Auto-merge: 'already can not be merged' alert | Valery Sizov | 2012-04-16 | 4 | -5/+25 |
| | | |||||
| * | Auto-merge: checking via AJAX | Valery Sizov | 2012-04-16 | 6 | -10/+43 |
| | | |||||
| * | fixed mr unmergable method | Dmitriy Zaporozhets | 2012-03-31 | 1 | -1/+1 |
| | | |||||
| * | Merge Button v1 complete | Dmitriy Zaporozhets | 2012-03-30 | 6 | -25/+31 |
| | | |||||
| * | Rake task to provider full repo access for gitolite-owner.\n Automerge ↵ | randx | 2012-03-30 | 2 | -0/+38 |
| | | | | | | | | requires gitlab user be able to push to any repo | ||||
| * | Unverify MR on every push. Ajax for MR accept. better UI | randx | 2012-03-30 | 5 | -9/+18 |
| | | |||||
| * | Better merge handling. show if MR can be accepted or not | randx | 2012-03-30 | 6 | -58/+83 |
| | | |||||
| * | Link for auto merge, db field for MR | Dmitriy Zaporozhets | 2012-03-30 | 5 | -25/+61 |
| | | |||||
| * | Raw gitlab automerge feature | randx | 2012-03-29 | 3 | -1/+44 |
| | | |||||
* | | VERSION to 2.4.0 | Dmitriy Zaporozhets | 2012-04-21 | 2 | -2/+2 |
| | | |||||
* | | linguist gitlab fork | Dmitriy Zaporozhets | 2012-04-21 | 2 | -11/+11 |
| | | |||||
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhq into ↵ | Dmitriy Zaporozhets | 2012-04-21 | 1 | -1/+1 |
|\ \ | | | | | | | | | | arthurschreiber-use_redcarpet_for_markdown | ||||
| * \ | Merge pull request #709 from blueyed/master | Dmitriy Zaporozhets | 2012-04-20 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Fix typo: "less then" => "less than" | ||||
| | * | | Fix typo: "less then" => "less than". | Daniel Hahler | 2012-04-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'use_redcarpet_for_markdown' of ↵ | Dmitriy Zaporozhets | 2012-04-21 | 7 | -10/+27 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | https://github.com/arthurschreiber/gitlabhq into arthurschreiber-use_redcarpet_for_markdown Conflicts: Gemfile Gemfile.lock | ||||
| * | | | Switch to Redcarpet for Markdown Rendering. | Arthur Schreiber | 2012-04-20 | 7 | -13/+30 |
| |/ / | | | | | | | | | | This gives us Github Flavored Markdown, which is awesome. | ||||
* | | | Project linguist integration | Dmitriy Zaporozhets | 2012-04-21 | 5 | -7/+20 |
| | | | |||||
* | | | Using github's linguist to better detect filetypes and to do syntax ↵ | Arthur Schreiber | 2012-04-20 | 6 | -56/+21 |
|/ / | | | | | | | highlighting. | ||||
* | | fixed admin root path for header | Dmitriy Zaporozhets | 2012-04-20 | 1 | -1/+1 |
| | | |||||
* | | Admin dashboard | randx | 2012-04-20 | 5 | -1/+76 |
| | | |||||
* | | Pagination and better perfomance for projects page. | randx | 2012-04-20 | 6 | -19/+42 |
| | | |||||
* | | Merge pull request #698 from Sindacious/master | Dmitriy Zaporozhets | 2012-04-20 | 1 | -1/+1 |
|\ \ | | | | | | | Display Milestones without a due date as active | ||||
| * | | display milestones that are not marked with a due date as active | James Newton | 2012-04-19 | 1 | -1/+1 |
| | | | |||||
* | | | Use try for commit prev_commit_id detectionv2.4.0pre | Dmitriy Zaporozhets | 2012-04-19 | 1 | -2/+2 |
| | | | |||||
* | | | Fix an issue with MR unavailable if remove source branch | Dmitriy Zaporozhets | 2012-04-19 | 1 | -5/+8 |
|/ / | |||||
* | | Merge pull request #696 from CodeBlock/patch-1 | Dmitriy Zaporozhets | 2012-04-19 | 1 | -3/+3 |
|\ \ | | | | | | | Fix a few grammatical mistakes in profile view. | ||||
| * | | Fix a few grammatical mistakes in profile view. | Ricky Elrod | 2012-04-19 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #687 from fixe/label-typo | Dmitriy Zaporozhets | 2012-04-17 | 1 | -6/+6 |
|\ \ | | | | | | | Fixed typo in label | ||||
| * | | Fixed typo in label | Tiago Ribeiro | 2012-04-18 | 1 | -6/+6 |
| | | | |||||
* | | | Merge pull request #686 from fixe/patch-1 | Dmitriy Zaporozhets | 2012-04-17 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | Fixed typo | ||||
| * | | Fixed typo | Tiago Ribeiro | 2012-04-18 | 1 | -2/+2 |
|/ / | |||||
* | | MR commits suppressed if too many. few icons | Dmitriy Zaporozhets | 2012-04-17 | 4 | -5/+29 |
| | | |||||
* | | Milestone filter for issues improved | Dmitriy Zaporozhets | 2012-04-17 | 1 | -4/+5 |
| | | |||||
* | | fixed app crash on new issue via get | Dmitriy Zaporozhets | 2012-04-17 | 1 | -4/+0 |
| | | |||||
* | | 1. Improved admin -> new project form | Dmitriy Zaporozhets | 2012-04-17 | 6 | -8/+20 |
| | | | | | | | | 2. Fixed bug: post-receive file was not added when create project via admin | ||||
* | | Issues form improved, Show milestone for Issue show | Dmitriy Zaporozhets | 2012-04-17 | 4 | -34/+76 |
| | | |||||
* | | User blocking improved. Admin area styled | Dmitriy Zaporozhets | 2012-04-16 | 13 | -109/+231 |
| | | |||||
* | | Commit header improved. finalize PR 667 | Dmitriy Zaporozhets | 2012-04-16 | 6 | -98/+97 |
| | |