summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | Use `member` instead of `tm`.Douwe Maan2015-03-152-33/+33
| * | | | | | | | | Use `project_member` instead of `team_member`.Douwe Maan2015-03-1525-134/+143
| * | | | | | | | | Use `group_member` instead of `users_group` or `membership`.Douwe Maan2015-03-1514-59/+59
|/ / / / / / / / /
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-141-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Merge pull request #8955 from wasamasa/fix-deploy.sh-typoRobert Schilling2015-03-141-1/+1
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Fix typoVasilij Schneidermann2015-03-141-1/+1
| | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge branch 'fix-mr-notes' into 'master'Dmitriy Zaporozhets2015-03-142-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use pre-wrap for diff code in discussion viewVinnie Okada2015-03-142-0/+6
|/ / / / / / /
* | | | | | | Merge branch 'more-flatly'Dmitriy Zaporozhets2015-03-143-9/+9
|\ \ \ \ \ \ \
| * | | | | | | Return some merge widget styles and make it more compactDmitriy Zaporozhets2015-03-143-9/+9
* | | | | | | | Merge branch 'resetyle-import' into 'master'Dmitriy Zaporozhets2015-03-142-25/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve import buttons on new project pageDmitriy Zaporozhets2015-03-142-25/+23
* | | | | | | | | Merge branch 'more-flatly' into 'master'Dmitriy Zaporozhets2015-03-1463-172/+167
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Improve compare switch buttonDmitriy Zaporozhets2015-03-141-7/+1
| * | | | | | | Refactor buttonsDmitriy Zaporozhets2015-03-1448-106/+92
| |/ / / / / /
| * | | | | | Use sass variabled for backgroung and border colorsDmitriy Zaporozhets2015-03-139-25/+33
| * | | | | | Improve css for file actionsDmitriy Zaporozhets2015-03-138-36/+43
|/ / / / / /
* | | | | | Update changelog with change to unicorn workers number recommendation.Marin Jankovski2015-03-131-4/+5
| |/ / / / |/| | | |
* | | | | 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
|\ \ \ \ \ \