summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
| |/ / / / /
* | | | | | 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/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
| |/ / / /
| * | | | Merge branch 'fix-api-mr-notes-ordering' into 'master'Douwe Maan2015-07-281-1/+1
| |\ \ \ \
| | * | | | Return comments in created order in merge request APIStan Hu2015-07-161-1/+1
| * | | | | Merge branch 'rake-update-commit-count' into 'master'Valery Sizov2015-07-271-0/+20
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Add rake task 'gitlab:update_commit_count'Daniel Gerhardt2015-07-241-0/+20
| * | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-07-241-0/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Gitlab Issue 707: Indent unfolded code 1 characterngentile2015-07-221-0/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'auth-icons-labels' into 'master' Valery Sizov2015-07-241-8/+20
| |\ \ \ \
| | * | | | Allow custom label to be set for authentication providers.auth-icons-labelsDouwe Maan2015-07-231-8/+20
| * | | | | Merge branch 'changes_for_gmail_inbox_actions' into 'master' Douwe Maan2015-07-231-73/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Remove docs and rake task for gmail actions to prevent problems with registra...changes_for_gmail_inbox_actionsMarin Jankovski2015-07-221-73/+0
| | |/ / /