summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix wikiuse-more-ruggedDmitriy Zaporozhets2014-09-259-23/+40
* Rollback diff drop and set default commit id to HEADDmitriy Zaporozhets2014-09-252-2/+2
* Decorate commit parentsDmitriy Zaporozhets2014-09-253-4/+9
* Improve diff and bump gitlab_git revisionDmitriy Zaporozhets2014-09-243-4/+5
* Use new version of gitlab_git with extended rugged usageDmitriy Zaporozhets2014-09-243-10/+16
* Merge pull request #7823 from cirosantilli/test-fetch-shellDmitriy Zaporozhets2014-09-242-5/+10
|\
| * Only clone GitLab Shell on tests if necessary.Ciro Santilli2014-09-222-5/+10
* | Merge pull request #7820 from skv-headless/move_blame_to_ruggedDmitriy Zaporozhets2014-09-242-11/+5
|\ \
| * | blame with ruggedskv2014-09-242-11/+5
| |/
* | Merge pull request #7816 from cirosantilli/factor-forkDmitriy Zaporozhets2014-09-242-8/+10
|\ \
| * | Factor fork button view.Ciro Santilli2014-09-232-8/+10
* | | Merge branch 'improve-protect-wording' into 'master'Dmitriy Zaporozhets2014-09-241-6/+6
|\ \ \
| * | | Improve the wording explaining protected branches.Sytse Sijbrandij2014-09-221-6/+6
| | |/ | |/|
* | | Add fixes to changelogMarin Jankovski2014-09-241-0/+3
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-242-11/+7
|\ \ \
| * \ \ Merge pull request #7838 from cirosantilli/evaluate-execRobert Schilling2014-09-241-1/+1
| |\ \ \
| | * | | evaluate -> execute_script when return not needed.Ciro Santilli2014-09-241-1/+1
| * | | | Merge pull request #7837 from cirosantilli/go-backRobert Schilling2014-09-241-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | evaluate_script history -> go_back and go_forward.Ciro Santilli2014-09-241-2/+2
| |/ / /
| * | | Merge pull request #7833 from cirosantilli/wiki-cur-urlRobert Schilling2014-09-231-8/+4
| |\ \ \
| | * | | Factor current_url + URI.path into current_path.Ciro Santilli2014-09-231-8/+4
* | | | | Merge branch 'jubianchi-api/improve-error-reporting' into 'master'Dmitriy Zaporozhets2014-09-2415-102/+369
|\ \ \ \ \
| * \ \ \ \ Merge branch 'api/improve-error-reporting' of https://github.com/jubianchi/gi...Dmitriy Zaporozhets2014-09-2315-102/+369
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Improve error reporting on users APIjubianchi2014-09-1615-103/+370
* | | | | | Merge branch 'git-access-tests' into 'master'Dmitriy Zaporozhets2014-09-241-0/+127
|\ \ \ \ \ \
| * | | | | | Refactor Gitlab::GitAccess testsDmitriy Zaporozhets2014-09-241-119/+66
| * | | | | | Add GitAccess specsDmitriy Zaporozhets2014-09-241-0/+180
|/ / / / / /
* | | | | | Add notice about weekend in release cycle.Sytse Sijbrandij2014-09-241-0/+4
|/ / / / /
* | | | | Merge pull request #7521 from hiroponz/fix-not-rendered-graph-edgeDmitriy Zaporozhets2014-09-231-3/+7
|\ \ \ \ \
| * | | | | Fix not rendered the network graph edge.Hiroyuki Sato2014-08-171-3/+7
* | | | | | Merge pull request #7317 from drpdigitalmedia/masterDmitriy Zaporozhets2014-09-231-0/+3
|\ \ \ \ \ \
| * | | | | | set the collation to utf8_general_ciAlexander Mills2014-08-131-0/+3
* | | | | | | Merge pull request #7795 from cirosantilli/factor-notes-cssDmitriy Zaporozhets2014-09-231-4/+7
|\ \ \ \ \ \ \
| * | | | | | | Factor .add-diff-note active state.Ciro Santilli2014-09-191-4/+7
* | | | | | | | Merge pull request #7793 from cirosantilli/replace-javascriptDmitriy Zaporozhets2014-09-235-15/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace javascript:; links with buttons.Ciro Santilli2014-09-225-15/+18
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'search-wiki-keyword' into 'master'Marin Jankovski2014-09-231-1/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Prevent 500 error on search results if description contains relative linkDmitriy Zaporozhets2014-09-231-1/+6
* | | | | | | | | Merge branch 'unicorn-timeout' into 'master'Dmitriy Zaporozhets2014-09-232-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Increase unicorn timeout to 60 secondsDmitriy Zaporozhets2014-09-232-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix-diff-500' into 'master'Marin Jankovski2014-09-231-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix 500 error on diff if file permission changedDmitriy Zaporozhets2014-09-231-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix-mr-commit-comment' into 'master'Marin Jankovski2014-09-232-3/+67
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix MR commenting system when new commits pushedDmitriy Zaporozhets2014-09-232-3/+67
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix_git_access' into 'master'Marin Jankovski2014-09-232-5/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix ref parsing in Gitlab::GitAccessJacob Vosmaer2014-09-232-5/+26
| |/ / / / / / / /
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2014-09-231-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge pull request #7692 from mr-vinn/fix-spec-rmJacob Vosmaer2014-09-231-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix invalid method in testVinnie Okada2014-09-221-1/+1
* | | | | | | | | | Merge branch 'monthly_doc' into 'master'Sytse Sijbrandij2014-09-231-1/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |