Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqv6.6.0.pre1 | Dmitriy Zaporozhets | 2014-02-14 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #6314 from jvanbaarsen/patch-2 | Sytse Sijbrandij | 2014-02-14 | 1 | -1/+1 |
| |\ | |||||
| | * | Update readme.md | Jeroen van Baarsen | 2014-02-13 | 1 | -1/+1 |
* | | | Merge branch 'improve_large_groups' into 'master' | Dmitriy Zaporozhets | 2014-02-14 | 27 | -172/+345 |
|\ \ \ | |/ / |/| | | |||||
| * | | Dont render more than 20 group members on Project#members page | Dmitriy Zaporozhets | 2014-02-14 | 1 | -2/+6 |
| * | | Use project_users_select_tag for Issue form and MR form | Dmitriy Zaporozhets | 2014-02-14 | 4 | -4/+31 |
| * | | Restyle issue/mr top filters for list | Dmitriy Zaporozhets | 2014-02-13 | 7 | -141/+154 |
| * | | Add placeholder support for project_users_select_tag | Dmitriy Zaporozhets | 2014-02-13 | 3 | -3/+5 |
| * | | project_user selectbox with ajax autocomplete | Dmitriy Zaporozhets | 2014-02-13 | 7 | -13/+98 |
| * | | Show avatars in ajax user selectbox | Dmitriy Zaporozhets | 2014-02-13 | 3 | -2/+12 |
| * | | Show only people who have assigned merge requests in assignee dropdown | Dmitriy Zaporozhets | 2014-02-13 | 3 | -2/+2 |
| * | | Show only people who have assigned issues in assignee dropdown | Dmitriy Zaporozhets | 2014-02-13 | 2 | -1/+2 |
| * | | Fix group test for new member add procedure | Dmitriy Zaporozhets | 2014-02-13 | 1 | -0/+1 |
| * | | Adopt Group#members page for large groups (> 100 users) | Dmitriy Zaporozhets | 2014-02-13 | 5 | -12/+42 |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2014-02-14 | 27 | -46/+424 |
|\ \ \ | |||||
| * \ \ | Merge branch 'feature/email-aliases' into 'master' | Dmitriy Zaporozhets | 2014-02-14 | 27 | -46/+424 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Add email aliases for users | Jason Hollingsworth | 2014-02-13 | 27 | -46/+424 |
| |/ / | |||||
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-02-14 | 5 | -4/+8 |
|\ \ \ | |||||
| * \ \ | Merge pull request #6315 from jvanbaarsen/fix-6311 | Sytse Sijbrandij | 2014-02-13 | 3 | -3/+3 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Fixes #6311: cp the init.d file locally instead of remote | Jeroen van Baarsen | 2014-02-13 | 3 | -3/+3 |
| |/ / | |||||
| * | | Merge pull request #6310 from jvanbaarsen/add-gitter-link | Sytse Sijbrandij | 2014-02-13 | 1 | -0/+2 |
| |\ \ | |||||
| | * | | Added gitter link | Jeroen van Baarsen | 2014-02-13 | 1 | -0/+2 |
| | |/ | |||||
| * | | Merge pull request #6258 from zzet/patch-6 | Dmitriy Zaporozhets | 2014-02-13 | 1 | -1/+3 |
| |\ \ | | |/ | |/| | |||||
| | * | Add emoji images to asset load path. | Andrew Kumanyaev | 2014-02-06 | 1 | -1/+3 |
* | | | Merge branch 'remove-backtics-in-anchor-text' into 'master' | Dmitriy Zaporozhets | 2014-02-13 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Backticks are just confusing here. | dosire | 2014-02-12 | 1 | -1/+1 |
* | | | | Merge branch 'mr_workflow' into 'master' | Sytse Sijbrandij | 2014-02-13 | 1 | -0/+36 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Explanation MR workflow and authorization | Jacob Vosmaer | 2014-02-13 | 1 | -0/+36 |
|/ / / | |||||
* | | | Merge pull request #6274 from cirosantilli/leave-group-from-members-page | Dmitriy Zaporozhets | 2014-02-13 | 23 | -151/+430 |
|\ \ \ | |||||
| * | | | User can leave group from group page. | Ciro Santillli | 2014-02-12 | 23 | -151/+430 |
* | | | | Update minor version upgrade guide get latest code section. | Marin Jankovski | 2014-02-12 | 1 | -2/+14 |
| |/ / |/| | | |||||
* | | | Merge branch 'markdown-styles' into 'master' | Dmitriy Zaporozhets | 2014-02-12 | 1 | -3/+9 |
|\ \ \ | |||||
| * | | | Markdown styles dependencies are optional. | dosire | 2014-02-12 | 1 | -3/+9 |
|/ / / | |||||
* | | | Merge branch 'remove-gem-button' into 'master' | Dmitriy Zaporozhets | 2014-02-12 | 1 | -2/+0 |
|\ \ \ | |/ / |/| | | |||||
| * | | Gemnasium makes us red even though we are not exposed to a JRuby bug. | dosire | 2014-02-12 | 1 | -2/+0 |
|/ / | |||||
* | | Merge branch 'refactor_compare' into 'master' | Dmitriy Zaporozhets | 2014-02-12 | 9 | -20/+27 |
|\ \ | |||||
| * | | Fix link for MR diff download | Dmitriy Zaporozhets | 2014-02-12 | 1 | -5/+7 |
| * | | Improve compare logic for EmailOnPush service | Dmitriy Zaporozhets | 2014-02-12 | 4 | -2/+13 |
| * | | Use gitlab_git 5.4.0 without BROKEN_DIFF constant | Dmitriy Zaporozhets | 2014-02-12 | 4 | -13/+7 |
* | | | Merge branch 'markup-dependencies' into 'master' | Dmitriy Zaporozhets | 2014-02-12 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add information about rich text format dependencies. | dosire | 2014-02-12 | 1 | -0/+4 |
|/ / | |||||
* | | Merge pull request #6298 from ralish/hipchat-spelling-fix | Dmitriy Zaporozhets | 2014-02-12 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix spelling of "GitLab" in HipChat service | Samuel D. Leslie | 2014-02-12 | 1 | -1/+1 |
* | | | Merge pull request #5520 from gabetax/rake_group_bulk_add_permissions | Dmitriy Zaporozhets | 2014-02-12 | 2 | -0/+40 |
|\ \ \ | |||||
| * | | | add rake gitlab:import: all_users_to_all_groups and user_to_groups | Gabe Martin-Dempesy | 2013-11-02 | 2 | -0/+40 |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2014-02-12 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'fix-projects-spelling' into 'master' | Sytse Sijbrandij | 2014-02-11 | 2 | -2/+2 |
| |\ \ \ \ | |||||
| | * | | | | Fix spelling of plural project (projects and not project's). | Pixelindustries | 2014-02-11 | 2 | -2/+2 |
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-02-12 | 3 | -1/+56 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge pull request #6297 from jojosch/user-public-ssh-keys-newline | Dmitriy Zaporozhets | 2014-02-11 | 3 | -1/+56 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | |