summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix Projectapi-new-attributesDouwe Maan2015-07-301-1/+1
* No more web urlDouwe Maan2015-07-304-14/+11
* Fix specsDouwe Maan2015-07-292-7/+13
* Merge branch 'master' into api-new-attributesDouwe Maan2015-07-2921-49/+350
|\
| * 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 'add-file' into 'master' Job van der Voort2015-07-282-1/+34
| |\ \ \ \ \
| | * | | | | fixed details in documentkaren Carias2015-07-271-2/+2
| | * | | | | added new document about adding new fileskaren Carias2015-07-232-1/+34
| * | | | | | Merge branch 'doc-size' into 'master' Job van der Voort2015-07-281-1/+4
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | fixed textkaren Carias2015-07-271-1/+2
| | * | | | | added info about repo sizekaren Carias2015-07-231-1/+3
| | |/ / / /
| * | | | | Merge branch 'unique-ssh' into 'master' Job van der Voort2015-07-271-0/+3
| |\ \ \ \ \
| | * | | | | added note about unique SSH keyskaren Carias2015-07-241-0/+3
| |/ / / / /
| * | | | | Merge branch 'labels-mr' into 'master' Job van der Voort2015-07-241-1/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | added note about labels in MRkaren Carias2015-07-231-1/+3
| |/ / / /
* | | | | Use URL helpersDouwe Maan2015-07-293-4/+5
* | | | | Add project star and fork count, group avatar URL and user/group web URL attr...Douwe Maan2015-07-284-1/+19
| |/ / / |/| | |
* | | | 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
|\ \ \ \ \
| * | | | | Fix commit data retrieval when branch name has single quotesStan Hu2015-07-267-5/+39
* | | | | | Merge branch 'rs-issue-2010' into 'master' Valery Sizov2015-07-283-16/+12
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Render Note field hints consistently for "new" and "edit" formsrs-issue-2010Robert Speicher2015-07-263-16/+12
* | | | | | Merge branch 'rake-update-commit-count' into 'master'Valery Sizov2015-07-272-0/+21
|\ \ \ \ \ \
| * | | | | | Add rake task 'gitlab:update_commit_count'Daniel Gerhardt2015-07-242-0/+21
* | | | | | | Merge branch 'rs-dev-issue-306' into 'master' Valery Sizov2015-07-272-2/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Create project services on Project creationrs-dev-issue-306Robert Speicher2015-07-252-0/+9