summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix CHANGELOG entryrs-mr-1050-followupRobert Speicher2015-07-301-1/+1
* Add spec to RelativeLinkFilter for Unicode filenamesRobert Speicher2015-07-302-2/+27
* Merge branch 'fix-image-file-is-not-displayed' into 'master'Robert Speicher2015-07-302-2/+4
|\
| * Fix the image file that contains non-ascii character is not displayedHiroyuki Sato2015-07-272-2/+4
* | Fix version for CHANGELOG entryStan Hu2015-07-301-1/+1
* | 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
* | | | Merge branch 'fix-single-quote-in-network-graph' into 'master'Douwe Maan2015-07-305-5/+25
|\ \ \ \
| * | | | Fix network graph when branch name has single quotesStan Hu2015-07-295-5/+25
| |/ / /
* | | | Merge branch 'ssh-key-form' into 'master' Job van der Voort2015-07-301-4/+3
|\ \ \ \
| * | | | Switched the otder of the SSH key formssh-key-formDarby2015-07-291-4/+3
* | | | | Merge branch 'fix-rake-import-check' into 'master'Marin Jankovski2015-07-304-5/+6
|\ \ \ \ \
| * | | | | Check that project was actually created rather than just validated in import:...Stan Hu2015-07-294-5/+6
| | |/ / / | |/| | |
* | | | | Merge branch 'typo-corrections' into 'master'Stan Hu2015-07-301-4/+4
|\ \ \ \ \
| * | | | | Minor styling fixes.Arno Fleming2015-07-251-4/+4
* | | | | | Merge branch 'omniauth-twitter' into 'master'Achilleas Pipinellis2015-07-301-7/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Updated Twitter OmniAuth documentationRaphaƫl Doursenaud2015-07-291-7/+5
|/ / / / /
* | | | | Merge github.com:gitlabhq/gitlabhqStan Hu2015-07-292-1/+2
|\ \ \ \ \
| * \ \ \ \ Merge pull request #9489 from dvrylc/fix-login-fieldStan Hu2015-07-292-1/+2
| |\ \ \ \ \
| | * | | | | Added tags to disable autocapitalize and autocorrect on login fieldDaryl Chan2015-07-292-1/+2
* | | | | | | Merge branch 'update_chnagelog' into 'master' Valery Sizov2015-07-291-2/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | update changelogValery Sizov2015-07-291-2/+12
|/ / / / / /
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqValery Sizov2015-07-294-2/+70
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'soft-launch-gitlab-git-http-server' into 'master' Douwe Maan2015-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 branch 'master' of gitlab.com:gitlab-org/gitlab-ceValery Sizov2015-07-29104-787/+1024
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | Merge pull request #9341 from rumpelsepp/rougeStan Hu2015-07-286-15/+180
| |\ \ \ \ \
| | * | | | | Manually update rouge to 1.9.1Stefan Tatschner2015-07-291-2/+2
| | * | | | | Add HTMLGitlab formatterStefan Tatschner2015-07-292-1/+169
| | * | | | | Replace Rugments with RougeStefan Tatschner2015-07-295-13/+10
| * | | | | | Merge branch 'rs-issue-2107' into 'master' Robert Speicher2015-07-281-1/+3
| |\ \ \ \ \ \
| | * | | | | | Make `hr`s more visible in note bodiesrs-issue-2107Robert Speicher2015-07-271-1/+3
| * | | | | | | Merge branch 'bitbucket-re-authorize' into 'master' Robert Speicher2015-07-283-6/+17
| |\ \ \ \ \ \ \
| | * | | | | | | Fix bug causing Bitbucket importer to crash when OAuth application had been r...bitbucket-re-authorizeDouwe Maan2015-07-283-6/+17
| * | | | | | | | Fix extraneous versionStan Hu2015-07-281-1/+0
| * | | | | | | | Merge branch 'fix-semaphore-build-failures' into 'master'Stan Hu2015-07-281-15/+15
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Change before(:all) -> let! to avoid leaking data across testsStan Hu2015-07-281-15/+15
| |/ / / / / / /
| * | | | | | | Merge branch 'bump-gitlab-git-for-500-error' into 'master'Stan Hu2015-07-283-3/+4
| |\ \ \ \ \ \ \
| | * | | | | | | Upgrade gitlab_git to version 7.2.6 to fix Error 500 when creating network gr...Stan Hu2015-07-283-3/+4
| |/ / / / / / /
| * | | | | | | Merge branch 'timestamp-wikis' into 'master' Job van der Voort2015-07-281-1/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Added a timestamp to the wikis page just below the titletimestamp-wikisDarby2015-07-271-1/+5
| * | | | | | Merge branch 'fix-api-mr-notes-ordering' into 'master'Douwe Maan2015-07-283-3/+7
| |\ \ \ \ \ \
| | * | | | | | Return comments in created order in merge request APIStan Hu2015-07-163-3/+6
| * | | | | | | Merge branch 'fix-quotes-in-branch' into 'master'Douwe Maan2015-07-287-5/+39
| |\ \ \ \ \ \ \