summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:gitlabhq/gitlabhqv6.6.0.pre1Dmitriy Zaporozhets2014-02-141-1/+1
|\
| * Merge pull request #6314 from jvanbaarsen/patch-2Sytse Sijbrandij2014-02-141-1/+1
| |\
| | * Update readme.mdJeroen van Baarsen2014-02-131-1/+1
* | | Merge branch 'improve_large_groups' into 'master'Dmitriy Zaporozhets2014-02-1427-172/+345
|\ \ \ | |/ / |/| |
| * | Dont render more than 20 group members on Project#members pageDmitriy Zaporozhets2014-02-141-2/+6
| * | Use project_users_select_tag for Issue form and MR formDmitriy Zaporozhets2014-02-144-4/+31
| * | Restyle issue/mr top filters for listDmitriy Zaporozhets2014-02-137-141/+154
| * | Add placeholder support for project_users_select_tagDmitriy Zaporozhets2014-02-133-3/+5
| * | project_user selectbox with ajax autocompleteDmitriy Zaporozhets2014-02-137-13/+98
| * | Show avatars in ajax user selectboxDmitriy Zaporozhets2014-02-133-2/+12
| * | Show only people who have assigned merge requests in assignee dropdownDmitriy Zaporozhets2014-02-133-2/+2
| * | Show only people who have assigned issues in assignee dropdownDmitriy Zaporozhets2014-02-132-1/+2
| * | Fix group test for new member add procedureDmitriy Zaporozhets2014-02-131-0/+1
| * | Adopt Group#members page for large groups (> 100 users)Dmitriy Zaporozhets2014-02-135-12/+42
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-02-1427-46/+424
|\ \ \
| * \ \ Merge branch 'feature/email-aliases' into 'master'Dmitriy Zaporozhets2014-02-1427-46/+424
| |\ \ \ | | |/ / | |/| |
| | * | Add email aliases for usersJason Hollingsworth2014-02-1327-46/+424
| |/ /
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-02-145-4/+8
|\ \ \
| * \ \ Merge pull request #6315 from jvanbaarsen/fix-6311Sytse Sijbrandij2014-02-133-3/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Fixes #6311: cp the init.d file locally instead of remoteJeroen van Baarsen2014-02-133-3/+3
| |/ /
| * | Merge pull request #6310 from jvanbaarsen/add-gitter-linkSytse Sijbrandij2014-02-131-0/+2
| |\ \
| | * | Added gitter linkJeroen van Baarsen2014-02-131-0/+2
| | |/
| * | Merge pull request #6258 from zzet/patch-6Dmitriy Zaporozhets2014-02-131-1/+3
| |\ \ | | |/ | |/|
| | * Add emoji images to asset load path.Andrew Kumanyaev2014-02-061-1/+3
* | | Merge branch 'remove-backtics-in-anchor-text' into 'master'Dmitriy Zaporozhets2014-02-131-1/+1
|\ \ \
| * | | Backticks are just confusing here.dosire2014-02-121-1/+1
* | | | Merge branch 'mr_workflow' into 'master'Sytse Sijbrandij2014-02-131-0/+36
|\ \ \ \ | |_|/ / |/| | |
| * | | Explanation MR workflow and authorizationJacob Vosmaer2014-02-131-0/+36
|/ / /
* | | Merge pull request #6274 from cirosantilli/leave-group-from-members-pageDmitriy Zaporozhets2014-02-1323-151/+430
|\ \ \
| * | | User can leave group from group page.Ciro Santillli2014-02-1223-151/+430
* | | | Update minor version upgrade guide get latest code section.Marin Jankovski2014-02-121-2/+14
| |/ / |/| |
* | | Merge branch 'markdown-styles' into 'master'Dmitriy Zaporozhets2014-02-121-3/+9
|\ \ \
| * | | Markdown styles dependencies are optional.dosire2014-02-121-3/+9
|/ / /
* | | Merge branch 'remove-gem-button' into 'master'Dmitriy Zaporozhets2014-02-121-2/+0
|\ \ \ | |/ / |/| |
| * | Gemnasium makes us red even though we are not exposed to a JRuby bug.dosire2014-02-121-2/+0
|/ /
* | Merge branch 'refactor_compare' into 'master'Dmitriy Zaporozhets2014-02-129-20/+27
|\ \
| * | Fix link for MR diff downloadDmitriy Zaporozhets2014-02-121-5/+7
| * | Improve compare logic for EmailOnPush serviceDmitriy Zaporozhets2014-02-124-2/+13
| * | Use gitlab_git 5.4.0 without BROKEN_DIFF constantDmitriy Zaporozhets2014-02-124-13/+7
* | | Merge branch 'markup-dependencies' into 'master'Dmitriy Zaporozhets2014-02-121-0/+4
|\ \ \ | |/ / |/| |
| * | Add information about rich text format dependencies.dosire2014-02-121-0/+4
|/ /
* | Merge pull request #6298 from ralish/hipchat-spelling-fixDmitriy Zaporozhets2014-02-121-1/+1
|\ \
| * | Fix spelling of "GitLab" in HipChat serviceSamuel D. Leslie2014-02-121-1/+1
* | | Merge pull request #5520 from gabetax/rake_group_bulk_add_permissionsDmitriy Zaporozhets2014-02-122-0/+40
|\ \ \
| * | | add rake gitlab:import: all_users_to_all_groups and user_to_groupsGabe Martin-Dempesy2013-11-022-0/+40
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-02-122-2/+2
|\ \ \ \
| * \ \ \ Merge branch 'fix-projects-spelling' into 'master'Sytse Sijbrandij2014-02-112-2/+2
| |\ \ \ \
| | * | | | Fix spelling of plural project (projects and not project's).Pixelindustries2014-02-112-2/+2
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-02-123-1/+56
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #6297 from jojosch/user-public-ssh-keys-newlineDmitriy Zaporozhets2014-02-113-1/+56
| |\ \ \ \ \ | | |/ / / / | |/| | | |