summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Split merge conflict messages on 2 linesnicer-merge-conflicts-widgetDmitriy Zaporozhets2015-08-061-1/+2
* Merge branch 'update_changelog_from_stable' into 'master' Valery Sizov2015-08-061-0/+3
|\
| * update chnagelogupdate_changelog_from_stableValery Sizov2015-08-051-0/+3
* | Merge branch 'fix-link-to-guide' into 'master'Douwe Maan2015-08-061-2/+2
|\ \
| * | Replace relative url with full path, remove old reference for indexesAchilleas Pipinellis2015-08-051-2/+2
* | | Merge branch 'remove-email-from-published-keys' into 'master'Douwe Maan2015-08-066-7/+33
|\ \ \
| * | | Only publish ssh key-type and keyZeger-Jan van de Weg2015-08-046-7/+33
* | | | Merge branch 'tree-author-at-end' into 'master'Dmitriy Zaporozhets2015-08-062-6/+5
|\ \ \ \
| * | | | Put author name at the end of a tree rowSven Strickroth2015-08-052-6/+5
* | | | | Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'Douwe Maan2015-08-065-4/+37
|\ \ \ \ \
| * | | | | Fix "Network" and "Graphs" pages for branches with encoded slashesStan Hu2015-08-023-1/+12
| * | | | | Fix errors deleting and creating branches with encoded slashesStan Hu2015-08-013-3/+25
* | | | | | 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
View Lorry Controller Status