summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove satellites from requirements docs and add CHANGELOGdrop-satellitesDmitriy Zaporozhets2015-08-052-2/+4
* Fix merge request creation without branch selectedDmitriy Zaporozhets2015-08-052-7/+7
* Improve tests to use real branches in merge requestsDmitriy Zaporozhets2015-08-044-13/+13
* Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-04220-1477/+2983
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-042-2/+5
| |\
| | * Merge branch 'update-mr-branch-text' into 'master'Douwe Maan2015-08-041-2/+4
| | |\
| | | * Update merge request text to reflect editability of source/target branchStan Hu2015-08-031-2/+4
| | * | Link to admin raketaskSytse Sijbrandij2015-08-031-0/+1
| * | | Merge branch 'add-user' into 'master' Job van der Voort2015-08-047-0/+29
| |\ \ \ | | |/ / | |/| |
| | * | typokaren Carias2015-08-031-1/+1
| | * | text fixedkaren Carias2015-08-032-8/+8
| | * | typokaren Carias2015-07-302-9/+9
| | * | added new doc about adding users and memberskaren Carias2015-07-307-0/+29
| * | | Merge branch 'add-license'Dmitriy Zaporozhets2015-08-035-8/+69
| |\ \ \
| | * \ \ Merge branch 'master' into add-licenseadd-licenseDouwe Maan2015-07-3116-337/+468
| | |\ \ \
| | * | | | Fix method name.Douwe Maan2015-07-301-1/+1
| | * | | | Show buttons to add license, changelog and contribution guide if they're miss...Douwe Maan2015-07-304-7/+68
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-033-46/+3
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'redis-store' into 'master' Kamil TrzciƄski2015-08-033-46/+3
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Bump redis-store to 1.1.6 and remove redid-store-fix-expiryredis-storeKamil Trzcinski2015-07-313-46/+3
| * | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-08-0348-406/+1069
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-08-029-6/+43
| | |\ \ \ \ \
| | | * \ \ \ \ Merge pull request #9520 from gipcompany/annotate-models-updateStan Hu2015-08-029-6/+43
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Re-annotate modelsAtsushi Ishida2015-08-039-6/+43
| | | |/ / / /
| | * | | | | Merge branch 'rs-code-links' into 'master' Douwe Maan2015-08-012-1/+5
| | |\ \ \ \ \
| | | * | | | | Make `code` elements in links display as suchrs-code-linksRobert Speicher2015-07-312-1/+5
| | |/ / / / /
| | * | | | | Merge branch 'api-useremails' into 'master' Robert Speicher2015-07-315-6/+425
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix indentationDouwe Maan2015-07-311-11/+11
| | | * | | | Merge branch 'master' into api-useremailsDouwe Maan2015-07-3126-362/+512
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | Fix docsDouwe Maan2015-07-302-7/+7
| | | * | | | Add ability to manage user email addresses via the API.Douwe Maan2015-07-295-0/+419
| | * | | | | Merge branch 'mention-name-in-flash-msg' into 'master'Douwe Maan2015-07-313-7/+8
| | |\ \ \ \ \
| | | * | | | | Raise alert when group is deleted.Achilleas Pipinellis2015-07-301-1/+1
| | | * | | | | Mention group and project name in flash messages upon create, update and delete.Achilleas Pipinellis2015-07-303-7/+8
| | * | | | | | Merge branch 'admin-group-member' into 'master' Douwe Maan2015-07-316-20/+33
| | |\ \ \ \ \ \
| | | * | | | | | Use before_actionsDouwe Maan2015-07-312-4/+7
| | | * | | | | | Restore Leave button on dashboard groups pageadmin-group-memberDouwe Maan2015-07-291-4/+3
| | | * | | | | | Show Leave button when you're the last owner, so that the error explains the ...Douwe Maan2015-07-281-1/+1
| | | * | | | | | Disable adding members from admin area when appropriateDouwe Maan2015-07-281-16/+18
| | | * | | | | | Add specific ability for managing group membersDouwe Maan2015-07-285-7/+16
| | * | | | | | | Merge branch 'fix-multiline-comment-highlighting' into 'master'Douwe Maan2015-07-313-2/+29
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Fix multi-line syntax highlightingStan Hu2015-07-303-2/+29
| | |/ / / / / /
| | * | | | | | Merge branch 'rs-mr-1050-followup' into 'master' Robert Speicher2015-07-313-3/+28
| | |\ \ \ \ \ \
| | | * | | | | | 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 'rs-markdown-feature-pipelines' into 'master' Robert Speicher2015-07-314-314/+388
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix setup/teardown for Markdown feature specrs-markdown-feature-pipelinesRobert Speicher2015-07-292-24/+9
| | | * | | | | | | Update Markdown feature to allow for multiple pipelinesRobert Speicher2015-07-282-163/+209
| | | * | | | | | | Add RelativeLinkFilter section to Markdown fixtureRobert Speicher2015-07-281-0/+7
| | | * | | | | | | Move MarkdownFeature to its own support fileRobert Speicher2015-07-282-115/+114