summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use simple_format if we don't have a proper rendererRobert Schilling2014-08-102-7/+2
* Rescue if markup fails, fixes #7455Robert Schilling2014-08-101-0/+2
* Merge branch 'better-formulated-memory-requirements' into 'master'Dmitriy Zaporozhets2014-08-091-5/+5
|\
| * Ensure that people know you need swap. Raise swap space for 512MB setups.Sytse Sijbrandij2014-08-091-5/+5
* | Merge branch 'sidekiq-and-ram' into 'master'Dmitriy Zaporozhets2014-08-091-0/+2
|\ \
| * | Explain that sidekiq doesn't eat as much ram as some people seem to suspect h...Sytse Sijbrandij2014-08-091-0/+2
| |/
* | Fix test broken by abdc4426486c6e6458c12ba49dd641d4c5ab257aDmitriy Zaporozhets2014-08-091-1/+1
* | Merge branch 'improve-test-env' into 'master'Dmitriy Zaporozhets2014-08-0963-972/+825
|\ \ | |/ |/|
| * Fix testsDmitriy Zaporozhets2014-08-074-156/+158
| * Fix application helper specsDmitriy Zaporozhets2014-08-071-2/+2
| * Fix gfm specsDmitriy Zaporozhets2014-08-061-4/+5
| * gfm should respect @ref value when build relative linksDmitriy Zaporozhets2014-08-061-1/+5
| * Fix api files specsDmitriy Zaporozhets2014-08-061-8/+10
| * Fix satellite testsDmitriy Zaporozhets2014-08-064-76/+51
| * Fix MR controller testsDmitriy Zaporozhets2014-08-061-3/+2
| * Fix commit specsDmitriy Zaporozhets2014-08-011-4/+7
| * Fix project and notes specsDmitriy Zaporozhets2014-08-013-51/+51
| * Fix API branch specsDmitriy Zaporozhets2014-08-011-23/+25
| * Fix API repository specsDmitriy Zaporozhets2014-08-012-9/+13
| * Fix notify specsDmitriy Zaporozhets2014-08-011-6/+7
| * Fix git_push service specsDmitriy Zaporozhets2014-08-011-2/+4
| * Fix dashboard testsDmitriy Zaporozhets2014-07-312-5/+5
| * Fix markdown tests. Use new repo for testing. Fixed gitlab-shell test setupDmitriy Zaporozhets2014-07-314-31/+29
| * Fix network testsDmitriy Zaporozhets2014-07-312-32/+32
| * Get gitlab-shell verion from file for install rake taskDmitriy Zaporozhets2014-07-311-1/+2
| * Improve copy test repo cmdDmitriy Zaporozhets2014-07-312-5/+5
| * Remove test dir only if existsDmitriy Zaporozhets2014-07-311-2/+6
| * Fix form mr testsDmitriy Zaporozhets2014-07-314-94/+54
| * Repository#path_to_repo should always return absolute pathDmitriy Zaporozhets2014-07-311-1/+4
| * Remove old test seedsDmitriy Zaporozhets2014-07-312-36/+0
| * Cleanup test dir before install gitlab-shell. Fix fork test scenarioDmitriy Zaporozhets2014-07-312-12/+4
| * Recreate tmp/tests on each test runDmitriy Zaporozhets2014-07-315-56/+52
| * Fix MR testsDmitriy Zaporozhets2014-07-313-20/+43
| * Fix MR factory and some MR testsDmitriy Zaporozhets2014-07-315-79/+67
| * Move all test repos data to ReposHelpersDmitriy Zaporozhets2014-07-3111-92/+124
| * Fix browse code spinach testsDmitriy Zaporozhets2014-07-3110-44/+53
| * Fix tags spinach testDmitriy Zaporozhets2014-07-311-1/+1
| * Uncomment change branch testDmitriy Zaporozhets2014-07-311-6/+4
| * Fix 500 error when rename repository. Fixes #1473Dmitriy Zaporozhets2014-07-311-0/+1
| * Dont stub gitlab-shell calls. Make test environment closer to real oneDmitriy Zaporozhets2014-07-314-140/+29
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2014-08-0721-52/+71
|\ \
| * \ Merge pull request #7442 from bbodenmiller/patch-9Jeroen van Baarsen2014-08-071-1/+1
| |\ \
| | * | make bullet punctuation consistentBen Bodenmiller2014-08-041-1/+1
| * | | Merge pull request #7434 from Razer6/fix_spelling_errorJeroen van Baarsen2014-08-0719-51/+51
| |\ \ \
| | * | | Fix spelling errors in doc, closes #7437Robert Schilling2014-08-0719-51/+51
| | |/ /
| * | | Merge pull request #7433 from bbodenmiller/patch-1Jeroen van Baarsen2014-08-071-0/+19
| |\ \ \
| | * | | add application check commandsBen Bodenmiller2014-08-041-0/+19
| | |/ /
* | | | Merge branch 'doc/api_file_edit' into 'master'Jacob Vosmaer2014-08-062-1/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Add comments.Sytse Sijbrandij2014-08-062-1/+3
| * | | List API file edit failure conditions in docsJacob Vosmaer2014-08-061-0/+7
View Lorry Controller Status