summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use gitlab-grit from githubomnibusJacob Vosmaer2014-02-052-5/+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
| * | Do not load all projects all the time.Marin Jankovski2014-02-031-14/+20
| * | Extract projects and mr into methods in features.Marin Jankovski2014-02-032-51/+45
| * | Scenarios for checking if MR are shown for internal and public projects.Marin Jankovski2014-02-022-0/+71
| * | Feature for visit issues page for internal project as auth user.Marin Jankovski2014-02-022-1/+29
| * | Feature visit issues page for public project as auth and non auth user.Marin Jankovski2014-02-012-0/+33
| * | Allow issues to be viewed for authenticated user when project is public or in...Marin Jankovski2014-01-311-1/+9
* | | Bump gitlab_omniauth-ldap gemDmitriy Zaporozhets2014-02-032-3/+3
* | | Merge pull request #6218 from brittlewis12/masterDmitriy Zaporozhets2014-02-011-2/+2
|\ \ \
| * | | changed h3, h4 markdown font sizing to match markdown spec -- h3: 1.5em, h4: ...brittlewis122014-01-311-2/+2
* | | | Merge pull request #5957 from ninech/dont-depend-on-appid-and-appsecretDmitriy Zaporozhets2014-02-011-4/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into dont-depend-on-appid-and-appsecretRaffael Schmid2014-01-23403-3020/+3554
| |\ \ \
| * | | | refactor omniauth configuration methodRaffael Schmid2013-12-301-4/+10
* | | | | Merge branch 'bug/broken_mr_select' into 'master'Dmitriy Zaporozhets2014-01-313-4/+27
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix bug with merge request branch selectDmitriy Zaporozhets2014-01-313-4/+27
|/ / / /
* | | | Dont check for python any moreDmitriy Zaporozhets2014-01-311-2/+0
* | | | Fix block/remove UI for admin::users#show pageDmitriy Zaporozhets2014-01-311-6/+4
* | | | Merge branch 'fix/line-numbers' into 'master'Dmitriy Zaporozhets2014-01-311-3/+4
|\ \ \ \
| * | | | Fix shifting line numbers.Jason Hollingsworth2014-01-301-3/+4
|/ / / /
* | | | Use linguist from rubygemsDmitriy Zaporozhets2014-01-302-16/+10
* | | | Merge branch 'remove_pygments' into 'master'Dmitriy Zaporozhets2014-01-304-41/+18
|\ \ \ \
| * | | | Remove python from installation docsDmitriy Zaporozhets2014-01-302-18/+0