summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* sync with upstream for ease to mergeGitLab2014-02-06920-8856/+17756
|\
| * merge with upstream masterGitLab2014-02-06920-8852/+17752
| |\
| | * Better color for nav linksDmitriy Zaporozhets2014-02-061-2/+2
| | * Merge branch 'link-to-recipies' into 'master'Dmitriy Zaporozhets2014-02-062-11/+6
| | |\
| | | * Remove duplication and link to CentOS guide.dosire2014-02-052-11/+6
| | * | Merge branch 'update_gitlab_grit' into 'master'Dmitriy Zaporozhets2014-02-061-1/+1
| | |\ \
| | | * | Update gitlab-gritJacob Vosmaer2014-02-051-1/+1
| | * | | Merge branch 'remove_ajax_gif' into 'master'Dmitriy Zaporozhets2014-02-0624-38/+44
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Improve turbolink spinnerDmitriy Zaporozhets2014-02-053-4/+4
| | | * | Replace gif animation with font icon spinnerDmitriy Zaporozhets2014-02-0523-38/+44
| | |/ /
| | * | Fixed commit align on dashboard feedDmitriy Zaporozhets2014-02-051-0/+2
| | * | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-02-051-2/+2
| | |\ \
| | | * \ Merge pull request #6252 from arruda/doc_fixSytse Sijbrandij2014-02-051-2/+2
| | | |\ \
| | | | * | removing comment about changing the git user password for postgres,Felipe Arruda Pontes2014-02-051-2/+2
| | * | | | Merge branch 'gitlab_git_gem' into 'master'Dmitriy Zaporozhets2014-02-052-12/+7
| | |\ \ \ \
| | | * | | | Use gitlab_git from rubygemsDmitriy Zaporozhets2014-02-052-12/+7
| | | |/ / /
| | * | | | Merge branch 'improve/compare_page' into 'master'Dmitriy Zaporozhets2014-02-055-11/+34
| | |\ \ \ \
| | | * | | | Prevent 500 error on Compare page if diff read timout happensDmitriy Zaporozhets2014-02-052-3/+12
| | | * | | | Use MergeRequestDiff::COMMITS_SAFE_SIZE for Compare diff limit.Dmitriy Zaporozhets2014-02-053-10/+10
| | | * | | | Prevent Compare page timout for large amount of commitsDmitriy Zaporozhets2014-02-053-1/+15
| | | |/ / /
| | * | | | Merge branch 'minor_refactoring' into 'master'Dmitriy Zaporozhets2014-02-054-6/+13
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Repository#blob_at_branchDmitriy Zaporozhets2014-02-054-6/+13
| | |/ / /
| | * | | Merge branch 'gitlab_git_rugged' into 'master'Dmitriy Zaporozhets2014-02-056-10/+20
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix blobs for file servicesDmitriy Zaporozhets2014-02-053-3/+6
| | | * | Fix markdown rendererDmitriy Zaporozhets2014-02-041-3/+11
| | | * | BUmp gitlab-git version (Blobs via rugged)Dmitriy Zaporozhets2014-02-042-4/+3
| | * | | Merge branch 'squashed-migrations' into 'master'Dmitriy Zaporozhets2014-02-0592-895/+306
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Squash migrations for years 2011 and 2012Dmitriy Zaporozhets2014-02-0492-895/+306
| | * | | Merge pull request #5294 from dalehamel/masterDmitriy Zaporozhets2014-02-041-0/+6
| | |\ \ \
| | | * | | Whitespace fixes to patchDale Hamel2013-10-081-2/+1
| | | * | | Ensure directory exists before changing in popenDale Hamel2013-10-081-0/+7
| | * | | | Merge pull request #6238 from athos-ribeiro/devise_unconfirmed_accessDmitriy Zaporozhets2014-02-041-2/+2
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Change Devise.confirm_within to Devise.allow_unconfirmed_access_forAthos Ribeiro2014-02-031-2/+2
| | * | | | Merge branch 'architecture' into 'master'Dmitriy Zaporozhets2014-02-042-20/+28
| | |\ \ \ \
| | | * | | | Remove duplication with readme. Remove unneeded spaces. Prevent people writin...dosire2014-02-042-21/+29
| | * | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-02-045-67/+18
| | |\ \ \ \ \
| | | * \ \ \ \ Merge pull request #6231 from babatakao/markdown-for-snippets-in-projectsDmitriy Zaporozhets2014-02-043-20/+17
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | | * | | | Enable markdown formatting for snippets in projects.Takao Baba2014-02-043-20/+17
| | | |/ / / /
| | | * | | | Merge pull request #6227 from jojosch/remove-python-docDmitriy Zaporozhets2014-02-032-47/+1
| | | |\ \ \ \
| | | | * | | | remove remaining python referencesJohannes Schleifenbaum2014-02-032-47/+1
| | | |/ / / /
| | * | | | | Merge branch 'bug/500_tag_name' into 'master'Dmitriy Zaporozhets2014-02-0413-72/+114
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | Improve code according to new gitlab_gitDmitriy Zaporozhets2014-02-046-15/+43
| | | * | | Use new gitlab_git revisionDmitriy Zaporozhets2014-02-042-3/+3
| | | * | | Fixed gitlab_git revDmitriy Zaporozhets2014-02-032-3/+3
| | | * | | Use new tags/branches from gitlab_gitDmitriy Zaporozhets2014-02-036-51/+57
| | | * | | Use recent gitlab_git libDmitriy Zaporozhets2014-02-032-6/+14
| | | |/ /
| | * | | Merge branch '500-message' into 'master'Dmitriy Zaporozhets2014-02-042-2/+2
| | |\ \ \
| | | * | | Truthful wording. Fixes #934dosire2014-02-042-2/+2
| | |/ / /
| | * | | Merge branch 'bug/filtering' into 'master'Dmitriy Zaporozhets2014-02-033-9/+150
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Filter items by project.Marin Jankovski2014-02-031-0/+1
View Lorry Controller Status