Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | #909 fix network graph json generation | Dmitry Kalinkin | 2012-06-19 | 1 | -13/+74 |
| | |||||
* | Improve gitlab encode method | randx | 2012-06-17 | 1 | -1/+2 |
| | |||||
* | Lets change how cucumber run on travis | randx | 2012-06-17 | 1 | -1/+1 |
| | |||||
* | Fix travis | randx | 2012-06-17 | 1 | -1/+1 |
| | |||||
* | fixed type | randx | 2012-06-16 | 1 | -1/+1 |
| | |||||
* | fix ci run | randx | 2012-06-16 | 1 | -1/+1 |
| | |||||
* | Cucumber: | Dmitriy Zaporozhets | 2012-06-15 | 2 | -0/+70 |
| | | | | | | | | * Profile * Browse code * Sceleton for main features * Wiki * Commits | ||||
* | Refactored theme css, added Modern theme pre version | randx | 2012-06-11 | 1 | -0/+15 |
| | |||||
* | specify utf-8 encoding for pygments.rb markdown wrapper | Nihad Abbasov | 2012-06-08 | 1 | -3/+3 |
| | |||||
* | #888 prevent to remove source_branch | Zevs | 2012-06-05 | 1 | -1/+1 |
| | |||||
* | ability to remove source branch after merge | Zevs | 2012-06-05 | 1 | -1/+7 |
| | |||||
* | Task#879 Relocated gitolite repo and lock file | Zevs | 2012-06-04 | 1 | -3/+3 |
| | |||||
* | - fix bash path | Sven Amonat | 2012-05-31 | 1 | -1/+1 |
| | |||||
* | Merge pull request #868 from SaitoWu/bugfix/encoding | Dmitriy Zaporozhets | 2012-05-30 | 2 | -13/+21 |
|\ | | | | | Bugfix/encoding | ||||
| * | must force_encoding to utf-8 first | Saito | 2012-05-30 | 1 | -1/+1 |
| | | |||||
| * | now render the correct authorname and message | Saito | 2012-05-30 | 1 | -2/+2 |
| | | |||||
| * | fix graph problem if authorname or message isnot utf8 encoding | Saito | 2012-05-30 | 1 | -2/+2 |
| | | |||||
| * | solve the binary problem | Saito | 2012-05-30 | 1 | -3/+7 |
| | | |||||
| * | rewrite encode strategy. | Saito | 2012-05-29 | 1 | -11/+15 |
| | | |||||
* | | move assets from lib directory to vendor | Nihad Abbasov | 2012-05-29 | 1 | -181/+0 |
|/ | | | | [ci skip] | ||||
* | Merge branch 'fix_encoding' of https://github.com/brodock/gitlabhq into ↵ | randx | 2012-05-27 | 1 | -4/+16 |
|\ | | | | | | | | | | | | | brodock-fix_encoding Conflicts: lib/gitlab/encode.rb | ||||
| * | Forgot to refactor a line on lib/gitlabhq/encode.rb | Gabriel Mazetto | 2012-05-26 | 1 | -1/+1 |
| | | |||||
| * | Better algorithm to deal with encodings. Moved fallback rescue message from ↵ | Gabriel Mazetto | 2012-05-26 | 1 | -3/+6 |
| | | | | | | | | | | view to encode library. This helps fix cases where UTF-8 is wrongly identified as ISO-8859-1. We will only try to convert strings if we are 100% sure about the charset, otherwise, we will fallback to UTF-8. | ||||
| * | Better fix for encoding problems on rendering of inline file visualizations ↵ | Gabriel Mazetto | 2012-05-26 | 1 | -0/+3 |
| | | | | | | | | like README files. | ||||
| * | Fixed encoding problems with plain/text blobs being sent without charset. | Gabriel Mazetto | 2012-05-26 | 1 | -3/+10 |
| | | |||||
* | | Images refactored, Feed icon replaced, Fixed comment form focus | randx | 2012-05-27 | 1 | -4/+4 |
| | | |||||
* | | lib/ refactoring. Module Gitlabhq renamed to Gitlab | randx | 2012-05-26 | 8 | -67/+69 |
|/ | |||||
* | Prevent app crash in case if encoding failedv2.5.0 | Dmitriy Zaporozhets | 2012-05-22 | 1 | -0/+4 |
| | |||||
* | Gem updates & githost logger | Dmitriy Zaporozhets | 2012-05-21 | 3 | -0/+11 |
| | | | | | | | * Grit gem updated * gitolite-client updated * logger added * few fixes | ||||
* | Task#755 auto-merge don`t work correctly. | Zevs | 2012-04-30 | 1 | -2/+5 |
| | |||||
* | MR: change path to lock file | Valery Sizov | 2012-04-27 | 1 | -4/+2 |
| | |||||
* | Rescue from CharlockHolmes failure | Thomas A. de Ruiter | 2012-04-24 | 1 | -1/+1 |
| | |||||
* | 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 |
| | |||||
* | fast automerge: done | Valery Sizov | 2012-04-22 | 3 | -4/+48 |
| | |||||
* | fast automerge: base implementation | Valery Sizov | 2012-04-22 | 2 | -11/+16 |
| | |||||
* | 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 | 3 | -10/+13 |
| | |||||
* | Merge remote-tracking branch 'origin/merge_button' | Dmitriy Zaporozhets | 2012-04-21 | 3 | -0/+86 |
|\ | | | | | | | | | | | 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: checking via AJAX | Valery Sizov | 2012-04-16 | 1 | -0/+1 |
| | | |||||
| * | Merge Button v1 complete | Dmitriy Zaporozhets | 2012-03-30 | 1 | -3/+6 |
| | | |||||
| * | 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 | ||||
| * | Better merge handling. show if MR can be accepted or not | randx | 2012-03-30 | 1 | -8/+19 |
| | | |||||
| * | Raw gitlab automerge feature | randx | 2012-03-29 | 1 | -0/+26 |
| | | |||||
* | | Merge branch 'use_redcarpet_for_markdown' of ↵ | Dmitriy Zaporozhets | 2012-04-21 | 1 | -0/+9 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+9 |
| | | | | | | | | | | | | This gives us Github Flavored Markdown, which is awesome. | ||||
* | | | Using github's linguist to better detect filetypes and to do syntax ↵ | Arthur Schreiber | 2012-04-20 | 1 | -44/+0 |
|/ / | | | | | | | highlighting. | ||||
* | | Removed encoding monkey patch | Dmitriy Zaporozhets | 2012-04-11 | 1 | -0/+14 |
| | |