summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove rubyracer gem.remove_rubyracerMarin Jankovski2015-03-132-7/+0
* Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-03-131-1/+1
|\
| * Merge pull request #8954 from pupaxxo/patch-2Robert Schilling2015-03-131-1/+1
| |\
| | * Fix typo in CHANGELOG.mdAndrea Ruggiero2015-03-131-1/+1
| |/
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-03-130-0/+0
|\ \
| * \ Merge branch 'fix_tests' into 'master'Douwe Maan2015-03-132-1/+3
| |\ \
| | * | Revert "Merge branch 'follow-on-mr376' into 'master'"Hannes Rosenögger2015-03-132-1/+3
| |/ /
| * | Merge branch 'follow-on-mr376' into 'master'Hannes Rosenögger2015-03-132-3/+1
| |\ \ | | |/ | |/|
| | * Remove unnecessary fetch of commit messages for initial push. This will reduc...Elliot2015-03-132-3/+1
* | | Change default number of unicorn workers to three.Marin Jankovski2015-03-132-2/+2
* | | Merge branch 'ldap-unblock-user' into 'master'Dmitriy Zaporozhets2015-03-133-1/+12
|\ \ \ | |/ / |/| |
| * | Unblock user if they were unblocked in AD.Douwe Maan2015-03-133-2/+12
* | | Merge branch 'bump-gitlab-git' into 'master'Dmitriy Zaporozhets2015-03-132-3/+3
|\ \ \
| * | | Bump gitlab_git to 7.1.1Dmitriy Zaporozhets2015-03-132-3/+3
* | | | Merge branch 'fix-encoding' into 'master'Dmitriy Zaporozhets2015-03-134-7/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Reuse blob object fetched by Gitlab::Git::Blame.Douwe Maan2015-03-131-2/+2
| * | | Everything from gitlab_git is already UTF-8.Douwe Maan2015-03-133-5/+5
| |/ /
* | | Merge branch 'tag-branch-hooks' into 'master'Dmitriy Zaporozhets2015-03-1310-45/+87
|\ \ \
| * | | Add changelog item.Douwe Maan2015-03-131-0/+1
| * | | Move tag deletion to service and execute hooks and services.Douwe Maan2015-03-132-6/+47
| * | | Ecevute hooks and services when branches are created/deleted through web.Douwe Maan2015-03-132-0/+5
| * | | More consistent method naming.Douwe Maan2015-03-132-5/+8
| * | | Use PushDataBuilder where applicable.Douwe Maan2015-03-134-27/+22
| * | | Set push data object kind in PushDataBuilder.Douwe Maan2015-03-133-7/+4
| |/ /
* | | Merge branch 'ldap-form' into 'master'Dmitriy Zaporozhets2015-03-133-4/+5
|\ \ \
| * | | Use custom LDAP label in LDAP signin form.Douwe Maan2015-03-133-4/+5
| |/ /
* | | Merge branch 'import-options-dup' into 'master'Dmitriy Zaporozhets2015-03-134-3/+4
|\ \ \
| * | | Fix import pages not working after first load.Douwe Maan2015-03-134-3/+4
| |/ /
* | | Merge branch 'update-webhooks-docs' into 'master'Robert Schilling2015-03-132-0/+3
|\ \ \
| * | | Update documentation for object_kind field in Webhook push and tag push WebhooksStan Hu2015-03-132-0/+3
|/ / /
* | | Merge branch 'enhance_markdown_linebreak_docs' into 'master'Hannes Rosenögger2015-03-131-0/+8
|\ \ \ | |/ / |/| |
| * | Add an example of creating a line break by adding two spaces atEwan Edwards2015-02-111-0/+8
* | | Merge branch 'irker-service-use-supported-events' into 'master'Drew Blessing2015-03-131-2/+8
|\ \ \
| * | | Make Irker service use the supported events checkStan Hu2015-03-041-2/+8
* | | | Merge branch 'mr-filter-by-title' into 'master'Dmitriy Zaporozhets2015-03-1311-35/+90
|\ \ \ \
| * \ \ \ Merge branch 'master' into mr-filter-by-titleDmitriy Zaporozhets2015-03-1234-64/+95
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'default-pagination' into 'master'Dmitriy Zaporozhets2015-03-1219-27/+29
|\ \ \ \ \
| * | | | | Use same constant for amount of items per pageDmitriy Zaporozhets2015-03-1219-27/+29
| | |_|_|/ | |/| | |
* | | | | Merge branch 'group-icon-performance' into 'master'Dmitriy Zaporozhets2015-03-1210-33/+39
|\ \ \ \ \
| * | | | | Fix specsDmitriy Zaporozhets2015-03-122-18/+21
| * | | | | Prevent database query each time we render group avatarDmitriy Zaporozhets2015-03-128-15/+18
| |/ / / /
* | | | | Merge branch 'replace_passwords_with_asterisk' into 'master'Marin Jankovski2015-03-122-2/+12
|\ \ \ \ \
| * | | | | Show asterisks instead of password in service edit form.Marin Jankovski2015-03-122-2/+12
* | | | | | Merge branch 'ldap-block-user' into 'master'Dmitriy Zaporozhets2015-03-123-2/+15
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Block user if he/she was blocked in Active DirectoryDmitriy Zaporozhets2015-03-123-2/+15
|/ / / / /
| | * | | Implement merge requests searchDmitriy Zaporozhets2015-03-1211-35/+90
| |/ / / |/| | |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-126-6/+108
|\ \ \ \
| * \ \ \ Merge branch 'fix_email_images' into 'master'Douwe Maan2015-03-126-6/+108
| |\ \ \ \
| | * | | | replace images in emails with inline imagesHannes Rosenögger2015-03-126-6/+108
* | | | | | Merge branch 'improve-import-page' into 'master'Dmitriy Zaporozhets2015-03-126-9/+56
|\ \ \ \ \ \ | |/ / / / / |/| | | | |