summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add ability to manage user email addresses via the API.Douwe Maan2015-07-295-0/+419
* 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
| |\ \ \ \ \
| | * | | | | 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
| | * | | | | | Only create :admin user in the one test where it's usedRobert Speicher2015-07-251-2/+3
| * | | | | | | Merge branch 'fix-notes-refresh-relative-url' into 'master'Stan Hu2015-07-262-1/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Fix live notes refresh in relative URL deploymentsStan Hu2015-07-262-1/+1
| |/ / / / / /
| * | | | | | Merge branch 'fix-reload-with-full-diff-url' into 'master'Stan Hu2015-07-255-13/+12
| |\ \ \ \ \ \
| | * | | | | | Fix the "Reload with full diff" URL buttonStan Hu2015-07-235-13/+12
| * | | | | | | Merge branch 'rs-issue-2092' into 'master' Douwe Maan2015-07-256-5/+27
| |\ \ \ \ \ \ \
| | * | | | | | | Dynamically check `:admin_*` ability in IssuableBaseServicers-issue-2092Robert Speicher2015-07-243-2/+14
| | * | | | | | | Dynamically check `:admin_*` ability on issuable formRobert Speicher2015-07-241-1/+1
| | * | | | | | | Add Issuable#to_ability_nameRobert Speicher2015-07-242-2/+12
| * | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-07-243-1/+6
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Merge pull request #9472 from Leibniz137/indent_unfolded_code_1_charStan Hu2015-07-223-1/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | Gitlab Issue 707: Indent unfolded code 1 characterngentile2015-07-223-1/+6
| | |/ / / / / / /
| * | | | | | | | Merge branch 'fix-error-500-when-no-head' into 'master'Valery Sizov2015-07-243-2/+22
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix Error 500 when browsing projects with no HEADStan Hu2015-07-243-2/+22
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'rs-issue-2058' into 'master' Valery Sizov2015-07-242-1/+3
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | / / / / | | |_|_|/ / / / | |/| | | | | |
View Lorry Controller Status