summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | added note about changing serverskaren Carias2015-08-041-1/+1
| | |/ / / / / / / / /
* | | | | | | | | | | Merge branch 'ci-skipped-status' into 'master' Kamil TrzciƄski2015-08-055-2/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added support for CI skipped statusci-skipped-statusKamil Trzcinski2015-08-045-2/+14
* | | | | | | | | | | | Merge branch 'revert_touch' into 'master' Sytse Sijbrandij2015-08-053-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Revert "Update noteable after a new note is added"revert_touchValery Sizov2015-08-053-6/+2
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'add-resend-confirm-email-admin-page' into 'master'Dmitriy Zaporozhets2015-08-056-0/+47
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add "Confirm user" button in user admin pageStan Hu2015-08-056-0/+47
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'rs-issue-2135' into 'master' Dmitriy Zaporozhets2015-08-052-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Update docs for Ruby MRI 2.1 requirementrs-issue-2135Robert Speicher2015-08-042-4/+4
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-08-052-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'semaphore-shield' into 'master'Robert Schilling2015-08-051-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Update the Semaphore badge to the shield badge typeJeroen van Baarsen2015-08-051-2/+2
| | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'master' into 'master'Achilleas Pipinellis2015-08-041-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | fixed typo in backup_restore.mdMike C2015-07-301-2/+2
| | * | | | | | | | | updated restore docs wrt backup location [ci skip]mchristof2015-07-231-1/+1
* | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-08-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | 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 remote-tracking branch 'public/project-buttons'Dmitriy Zaporozhets2015-08-057-26/+38
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Don't hide the clone holder for an empty projectproject-buttonsRobert Speicher2015-08-041-3/+3
| * | | | | | | | | | Merge branch 'master' into project-buttonsDouwe Maan2015-07-3116-337/+468
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Tweak project page buttons.Douwe Maan2015-07-317-26/+38
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | 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
| |\ \ \ \ \ \ \