summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ensure old namespace directory exists before moving itfix-namespace-move-dirDmitriy Zaporozhets2015-08-061-0/+3
* Update stable branch in installation documentation. Fixes #2191Achilleas Pipinellis2015-08-051-2/+2
* Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-0568-1069/+288
|\
| * Remove satellites from requirements docs and add CHANGELOGdrop-satellitesDmitriy Zaporozhets2015-08-052-2/+4
| * Fix merge request creation without branch selectedDmitriy Zaporozhets2015-08-052-7/+7
| * Improve tests to use real branches in merge requestsDmitriy Zaporozhets2015-08-044-13/+13
| * Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-04220-1477/+2983
| |\
| * | Fix merge api and specDmitriy Zaporozhets2015-08-042-15/+13
| * | Remove satellites mention from architecture docDmitriy Zaporozhets2015-07-161-3/+3
| * | Use real branches from test repoDmitriy Zaporozhets2015-07-161-4/+4
| * | Fix some of testsDmitriy Zaporozhets2015-07-163-4/+4
| * | Fix refresh serviceDmitriy Zaporozhets2015-07-161-1/+1
| * | Increase COMMITS_SAFE_SIZE to reasonable size in compare to diff limits. Fix ...Dmitriy Zaporozhets2015-07-162-6/+5
| * | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-1620-133/+139
| * | Refactor compare and fetch logicDmitriy Zaporozhets2015-07-158-51/+36
| * | Implement update of ref when merge request code is reloadedDmitriy Zaporozhets2015-07-151-9/+18
| * | Implement merge from forks without satellitesDmitriy Zaporozhets2015-07-157-22/+62
| * | Fix application initializeDmitriy Zaporozhets2015-07-152-1/+5
| * | Remove satellitesDmitriy Zaporozhets2015-07-1535-844/+18
| * | Fetch reference from fork repo when create merge requestDmitriy Zaporozhets2015-07-152-0/+14
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-052-0/+2
|\ \ \
| * \ \ Merge branch 'update_release_doc' into 'master' Dmitriy Zaporozhets2015-08-052-0/+2
| |\ \ \
| | * | | update release docValery Sizov2015-08-052-0/+2
| | | |/ | | |/|
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-08-051-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'server-note' into 'master' Job van der Voort2015-08-051-2/+2
| |\ \ \
| | * | | added note about changing serverskaren Carias2015-08-041-1/+1
| | |/ /
* | | | Merge branch 'ci-skipped-status' into 'master' Kamil Trzciński2015-08-055-2/+14
|\ \ \ \
| * | | | Added support for CI skipped statusci-skipped-statusKamil Trzcinski2015-08-045-2/+14
* | | | | Merge branch 'revert_touch' into 'master' Sytse Sijbrandij2015-08-053-6/+2
|\ \ \ \ \
| * | | | | Revert "Update noteable after a new note is added"revert_touchValery Sizov2015-08-053-6/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'add-resend-confirm-email-admin-page' into 'master'Dmitriy Zaporozhets2015-08-056-0/+47
|\ \ \ \ \
| * | | | | Add "Confirm user" button in user admin pageStan Hu2015-08-056-0/+47
* | | | | | Merge branch 'rs-issue-2135' into 'master' Dmitriy Zaporozhets2015-08-052-3/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Update docs for Ruby MRI 2.1 requirementrs-issue-2135Robert Speicher2015-08-042-4/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-052-4/+4
|\ \ \ \ \
| * \ \ \ \ Merge branch 'semaphore-shield' into 'master'Robert Schilling2015-08-051-2/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Update the Semaphore badge to the shield badge typeJeroen van Baarsen2015-08-051-2/+2
| * | | | | Merge branch 'master' into 'master'Achilleas Pipinellis2015-08-041-2/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | fixed typo in backup_restore.mdMike C2015-07-301-2/+2
| | * | | | updated restore docs wrt backup location [ci skip]mchristof2015-07-231-1/+1
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-08-051-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'rs-fix-rouge-inline-theme' into 'master' Stan Hu2015-08-041-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fix the `inline_theme` option for the Rouge formatterrs-fix-rouge-inline-themeRobert Speicher2015-08-011-1/+1
* | | | | | Merge remote-tracking branch 'public/project-buttons'Dmitriy Zaporozhets2015-08-057-26/+38
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Don't hide the clone holder for an empty projectproject-buttonsRobert Speicher2015-08-041-3/+3
| * | | | | Merge branch 'master' into project-buttonsDouwe Maan2015-07-3116-337/+468
| |\ \ \ \ \
| * | | | | | Tweak project page buttons.Douwe Maan2015-07-317-26/+38
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-042-2/+5
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'update-mr-branch-text' into 'master'Douwe Maan2015-08-041-2/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Update merge request text to reflect editability of source/target branchStan Hu2015-08-031-2/+4
View Lorry Controller Status