summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix gitlab CI linksfix_ci_servicesValery Sizov2015-05-053-2/+7
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceRobert Schilling2015-05-051-2/+2
|\
| * Merge branch 'master' into 'master'Robert Schilling2015-05-051-2/+2
| |\
| | * Docker: update omnibus packageJakob Englisch2015-05-041-2/+2
* | | Merge pull request #9238 from quodos/masterRobert Schilling2015-05-041-1/+1
|\ \ \ | |/ / |/| |
| * | Update authentication.rbquodos2015-05-041-1/+1
* | | Merge branch 'improve-external-issue-tracker-config-doc' into 'master'Marin Jankovski2015-05-041-0/+5
|\ \ \
| * | | Improve documentation of configuring external issue trackersStan Hu2015-05-041-0/+5
| | |/ | |/|
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-045-0/+34
|\ \ \ | |/ /
| * | Merge branch 'fix-wiki-search' into 'master'Dmitriy Zaporozhets2015-05-045-0/+34
| |\ \
| | * | Fix Error 500 when searching Wiki pagesStan Hu2015-04-305-0/+34
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-043-3/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #9097 from sselberg/add-current_sign_in_at-to-rest-apiDmitriy Zaporozhets2015-05-043-3/+6
| |\ \ \ | | |/ / | |/| |
| | * | Add current_sign_in_at to api UserSven Selberg2015-05-043-3/+6
* | | | Merge branch 'Add_doc_block_new_users_by_default' into 'master'Job van der Voort2015-05-041-0/+9
|\ \ \ \ | |/ / / |/| | |
| * | | update doc by removing unnecessary partsJob van der Voort2015-05-041-29/+3
| * | | Added " How to maintain tight control over the number of active users on your...Karen Carias2015-04-241-0/+35
* | | | Merge branch 'fix-escaped-branches-in-compare' into 'master'Douwe Maan2015-05-043-2/+28
|\ \ \ \
| * | | | Unescape branch names in compare commitStan Hu2015-04-303-2/+28
| | |_|/ | |/| |
* | | | Merge branch 'annotate-models-update' into 'master'Robert Speicher2015-05-0339-26/+118
|\ \ \ \ | |_|_|/ |/| | |
| * | | Re-annotate modelsStan Hu2015-05-0339-26/+118
|/ / /
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Schilling2015-05-031-1/+1
|\ \ \
| * \ \ Merge pull request #9237 from bbodenmiller/patch-1Robert Schilling2015-05-031-1/+1
| |\ \ \
| | * | | add missing word to changelogBen Bodenmiller2015-05-031-1/+1
* | | | | Merge branch 'fix-config-yml-example' into 'master'Achilleas Pipinellis2015-05-031-3/+3
|\ \ \ \ \
| * | | | | Fix config template from parse errorsStan Hu2015-05-031-3/+3
|/ / / / /
* | | | | Merge branch 'fix/log-path' into 'master'Achilleas Pipinellis2015-05-031-8/+8
|\ \ \ \ \
| * | | | | Fix file paths for installations from the sourceMarcos SF Filho2015-04-271-8/+8
* | | | | | Merge branch 'fix_snippet_api_doc' into 'master'Achilleas Pipinellis2015-05-031-0/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add snippet visibilty as parameter to API doc, closes #1562Robert Schilling2015-05-031-0/+15
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceRobert Schilling2015-05-032-1/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'changelog-remove-dup' into 'master'Achilleas Pipinellis2015-05-031-1/+0
| |\ \ \ \ \ \
| | * | | | | | Remove duplicate CHANGELOG line for v7.10.0Aurelio Jargas2015-04-221-1/+0
| * | | | | | | Merge branch 'master' into 'master'Achilleas Pipinellis2015-05-031-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Update config.yml.examplewin322015-05-021-1/+4
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Schilling2015-05-0336-108/+353
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'api-iid' of https://github.com/jubianchi/gitlabhq into jubianch...Dmitriy Zaporozhets2015-05-0310-6/+49
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Query issues, merge requests and milestones with their IID through APIjubianchi2015-05-0210-6/+49
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #9066 from jirutka/fix-6417Dmitriy Zaporozhets2015-05-034-12/+14
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix #6417: users with group permission should be able to create groups via APIRobert Schilling2015-03-314-12/+14
| * | | | | | | | | Merge pull request #9234 from dsander/group-milestones-by-titleDmitriy Zaporozhets2015-05-037-33/+11
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Group milestones by title in the dashboard and all other issue viewsDominik Sander2015-05-016-8/+11
| | * | | | | | | | | Removed unused ApplicationController#set_filter_values methodDominik Sander2015-05-011-25/+0
| * | | | | | | | | | Merge pull request #8756 from zaburt/force_utf8_on_oauth_propertiesDmitriy Zaporozhets2015-05-034-35/+100
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | add common method to force utf8 and force oauth properties to be utf8Onur Küçük2015-05-034-35/+100
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'change-primary-email' into 'master'Dmitriy Zaporozhets2015-05-036-18/+46
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | * | | | | | | | | Allow primary email to be set to an email that you've already added.change-primary-emailDouwe Maan2015-04-306-18/+46
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'restrict-signups-to-domains' into 'master'Dmitriy Zaporozhets2015-05-0310-4/+133
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add application setting to restrict user signups to e-mail domainsStan Hu2015-05-0210-4/+133
* | | | | | | | | | | Add period at snippet visibilty descriptionRobert Schilling2015-05-031-1/+1
|/ / / / / / / / / /