summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-1110-5/+520
* Merge branch 'rs-reference-data-attrs' into 'master' Robert Speicher2015-08-108-8/+32
|\
| * Add `data-[type]-id` attribute to reference linksrs-reference-data-attrsRobert Speicher2015-08-088-8/+32
* | Merge branch 'bitbucket-show-incompatible' into 'master'Douwe Maan2015-08-071-0/+4
|\ \
| * | Show incompatible projects in Bitbucket import statusStan Hu2015-08-071-0/+4
| |/
* | Merge branch 'master' into comment-updated-byDouwe Maan2015-08-0615-533/+141
|\ \ | |/
| * Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'Douwe Maan2015-08-061-1/+1
| |\
| | * Fix "Network" and "Graphs" pages for branches with encoded slashesStan Hu2015-08-021-1/+1
| * | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-0510-520/+5
| |\ \
| | * \ Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-0424-118/+484
| | |\ \
| | * | | Fix merge api and specDmitriy Zaporozhets2015-08-041-1/+1
| | * | | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-161-1/+5
| | * | | Fix application initializeDmitriy Zaporozhets2015-07-151-0/+4
| | * | | Remove satellitesDmitriy Zaporozhets2015-07-159-523/+0
| * | | | 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 branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-08-0310-22/+173
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'api-useremails' into 'master' Robert Speicher2015-07-312-6/+121
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix indentationDouwe Maan2015-07-311-11/+11
| | | * | Merge branch 'master' into api-useremailsDouwe Maan2015-07-318-14/+42
| | | |\ \
| | | * | | Add ability to manage user email addresses via the API.Douwe Maan2015-07-292-0/+115
| | * | | | Fix multi-line syntax highlightingStan Hu2015-07-301-2/+10
| | | |/ / | | |/| |
| * | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-p...Jacob Vosmaer2015-07-2913-95/+300
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-p...Jacob Vosmaer2015-07-2713-30/+103
| |\ \ \ \
| * | | | | Allow custom backup archive permissionsJacob Vosmaer2015-07-061-3/+3
* | | | | | Merge branch 'master' into comment-updated-byDouwe Maan2015-07-318-14/+42
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'rs-mr-1050-followup' into 'master' Robert Speicher2015-07-311-2/+11
| |\ \ \ \ \
| | * | | | | Add spec to RelativeLinkFilter for Unicode filenamesRobert Speicher2015-07-301-2/+11
| * | | | | | Merge branch 'api-new-attributes' into 'master' Robert Speicher2015-07-301-0/+10
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | No more web urlDouwe Maan2015-07-301-2/+10
| | * | | | | Merge branch 'master' into api-new-attributesDouwe Maan2015-07-297-12/+257
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Add project star and fork count, group avatar URL and user/group web URL attr...Douwe Maan2015-07-281-1/+3
| * | | | | | Merge branch 'fix-image-file-is-not-displayed' into 'master'Robert Speicher2015-07-301-2/+3
| |\ \ \ \ \ \
| | * | | | | | Fix the image file that contains non-ascii character is not displayedHiroyuki Sato2015-07-271-2/+3
| * | | | | | | Merge branch 'backup-directory-permissions' into 'master' Stan Hu2015-07-304-6/+14
| |\ \ \ \ \ \ \
| | * | | | | | | Stricter mkdir's in 'rake gitlab:backup:create'backup-directory-permissionsJacob Vosmaer2015-07-303-4/+14
| | * | | | | | | Set internal backup directory modes on createJacob Vosmaer2015-07-294-5/+3
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'fix-rake-check-hooks' into 'master'Jacob Vosmaer2015-07-301-4/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Check that hooks directory exists before attempting to call realpathStan Hu2015-07-301-4/+4
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Check that project was actually created rather than just validated in import:...Stan Hu2015-07-291-2/+2
| |/ / / / / /
* | | | | | | Show who last edited a comment if it wasn't the original authorDouwe Maan2015-07-301-7/+5
|/ / / / / /
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqValery Sizov2015-07-294-2/+70
|\ \ \ \ \ \
| * | | | | | Fix style pointsGitLab2015-07-282-8/+7
| * | | | | | Send GL_ID to gitlab-git-http-server as JSONGitLab2015-07-281-3/+4
| * | | | | | Handle missing @user during Git HTTP requestsGitLab2015-07-281-1/+10
| * | | | | | Experimental support for gitlab-git-http-serverJacob Vosmaer2015-07-284-2/+61
| |/ / / / /
* | | | | | Merge pull request #9341 from rumpelsepp/rougeStan Hu2015-07-282-4/+172
|\ \ \ \ \ \
| * | | | | | Add HTMLGitlab formatterStefan Tatschner2015-07-291-0/+168
| * | | | | | Replace Rugments with RougeStefan Tatschner2015-07-291-4/+4
| | |_|/ / / | |/| | | |
* | | | | | Fix bug causing Bitbucket importer to crash when OAuth application had been r...bitbucket-re-authorizeDouwe Maan2015-07-281-6/+15
|/ / / / /