summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix minor errors/annoyances in email templatesDrew Blessing2013-11-0810-29/+29
* Removed Project#discover_default_branch since it not needed any moreDmitriy Zaporozhets2013-11-085-16/+0
* Require gitlab-shell 1.7.6Dmitriy Zaporozhets2013-11-062-2/+2
* Merge branch 'improve/default_branch' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-11-0612-22/+34
|\
| * update CHANGELOG with default_branch changesDmitriy Zaporozhets2013-11-061-0/+2
| * Fix spinach testsDmitriy Zaporozhets2013-11-061-1/+1
| * Remove default_branch support from API project creationDmitriy Zaporozhets2013-11-063-8/+0
| * Replace assign with stub for default_branchDmitriy Zaporozhets2013-11-061-2/+2
| * Project#default_branch use repo HEAD instead of DB value nowDmitriy Zaporozhets2013-11-066-11/+29
|/
* Refactor search viewsDmitriy Zaporozhets2013-11-069-64/+65
* Look for project description during searchDmitriy Zaporozhets2013-11-061-1/+1
* More entries to changelogDmitriy Zaporozhets2013-11-061-0/+2
* Merge branch 'feature/leave_project' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-11-055-3/+29
|\
| * New feature: Ability to leave projectDmitriy Zaporozhets2013-11-055-3/+29
* | Remove User#namespaces method from codeDmitriy Zaporozhets2013-11-053-7/+9
* | Refactor user associations. Drop support of Group#owner_idDmitriy Zaporozhets2013-11-051-13/+10
|/
* Revert "More escaping"Dmitriy Zaporozhets2013-11-055-19/+17
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-11-055-17/+19
|\
| * Merge pull request #5500 from nkukard/esc-strings2Jacob Vosmaer2013-11-055-17/+19
| |\
| | * More escapingNigel Kukard2013-11-045-17/+19
* | | Merge branch 'feature/create_file' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-11-0518-80/+315
|\ \ \ | |/ / |/| |
| * | Hide new file link if not branch HEADDmitriy Zaporozhets2013-11-051-5/+6
| * | Refactoring for EditTree and NewTree controllers and contextsDmitriy Zaporozhets2013-11-056-52/+65
| * | Move part of file creation logic into separate contextDmitriy Zaporozhets2013-11-055-51/+89
| * | Feature test for New file featureDmitriy Zaporozhets2013-11-053-9/+22
| * | New feature: Create file from UIDmitriy Zaporozhets2013-11-058-26/+196
|/ /
* | Merge branch 'consistent-numbering' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-11-041-1/+1
|\ \
| * | Number 3 was missing.Sytse Sijbrandij2013-11-041-1/+1
|/ /
* | Merge branch 'gitlab_shell_in_patch_doc' of /home/git/repositories/gitlab/git...Dmitriy Zaporozhets2013-11-041-3/+11
|\ \
| * | Include gitlab-shell in patch update docJacob Vosmaer2013-11-041-3/+11
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2013-11-0411-11/+152
|\ \ \
| * \ \ Merge branch 'security_update_master' of /home/git/repositories/gitlab/gitlabhqDmitriy Zaporozhets2013-11-0411-11/+152
| |\ \ \
| | * | | Add security update info to 6.0-to-6.2.mdJacob Vosmaer2013-11-021-2/+5
| | * | | Clarify upgrade stepsJacob Vosmaer2013-11-024-4/+4
| | * | | Add 5.1-to-5.4 update pathJacob Vosmaer2013-11-023-2/+105
| | * | | Bump gitlab-shell in 5.4 and 6.2Jacob Vosmaer2013-11-022-9/+17
| | * | | Add security warnings to update docsJacob Vosmaer2013-11-029-0/+27
* | | | | Merge pull request #5507 from jojosch/project-issue-tracker-selectionDmitriy Zaporozhets2013-11-045-3/+64
|\ \ \ \ \
| * | | | | Preselect the current issue tracker with selected="selected"Johannes Schleifenbaum2013-11-015-3/+64
* | | | | | Merge pull request #5521 from mynetx/ie10-css-gradientsDmitriy Zaporozhets2013-11-043-0/+7
|\ \ \ \ \ \
| * | | | | | Support -ms-linear-gradient style for IE10+J.M2013-11-023-0/+7
* | | | | | | Merge pull request #5528 from mcepl/patch-1Dmitriy Zaporozhets2013-11-041-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix name of RHELMatěj Cepl2013-11-041-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2013-11-044-5/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5400 from lokedhs/masterJacob Vosmaer2013-11-041-1/+1
| |\ \ \ \ \
| | * | | | | When looking up a user by DN, use single scopeElias Mårtenson2013-11-031-1/+1
| | |/ / / /
| * | | | | Merge pull request #5512 from jhollingsworth/feature/missing-group-500-fixDmitriy Zaporozhets2013-11-032-1/+2
| |\ \ \ \ \
| | * | | | | Fixes 500 error when user types in wrong group name.Jason Hollingsworth2013-11-012-1/+2
| | |/ / / /
| * | | | | Merge pull request #5519 from zzet/patch-3Dmitriy Zaporozhets2013-11-031-3/+10
| |\ \ \ \ \
| | * | | | | Run tests in parallel on travisAndrew Kumanyaev2013-11-021-3/+10
| | |/ / / /