| Commit message (Collapse) | 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 | ||||
| | | * | Update readme.md | Jeroen van Baarsen | 2014-02-13 | 1 | -1/+1 |
| | | | | | | | | | | Changed `Gitter` to `Gitter chat room` | ||||
| * | | | Merge branch 'improve_large_groups' into 'master' | Dmitriy Zaporozhets | 2014-02-14 | 27 | -172/+345 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve for large groupsImprove for large groups This merge request is a set of patched to improve application for large groups with more then 100 people. Pages to be improved: :white_check_mark: Group#members page :white_check_mark: Project#issues page :white_check_mark: Project#merge_requests page :white_check_mark: Project#new_issue page :white_check_mark: Project#new_mr page :white_check_mark: Project#members page | ||||
| | * | | Dont render more than 20 group members on Project#members page | Dmitriy Zaporozhets | 2014-02-14 | 1 | -2/+6 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Use project_users_select_tag for Issue form and MR form | Dmitriy Zaporozhets | 2014-02-14 | 4 | -4/+31 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Restyle issue/mr top filters for list | Dmitriy Zaporozhets | 2014-02-13 | 7 | -141/+154 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Add placeholder support for project_users_select_tag | Dmitriy Zaporozhets | 2014-02-13 | 3 | -3/+5 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | project_user selectbox with ajax autocomplete | Dmitriy Zaporozhets | 2014-02-13 | 7 | -13/+98 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Show avatars in ajax user selectbox | Dmitriy Zaporozhets | 2014-02-13 | 3 | -2/+12 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Show only people who have assigned merge requests in assignee dropdown | Dmitriy Zaporozhets | 2014-02-13 | 3 | -2/+2 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Show only people who have assigned issues in assignee dropdown | Dmitriy Zaporozhets | 2014-02-13 | 2 | -1/+2 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Fix group test for new member add procedure | Dmitriy Zaporozhets | 2014-02-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Adopt Group#members page for large groups (> 100 users) | Dmitriy Zaporozhets | 2014-02-13 | 5 | -12/+42 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | 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 Email aliases are used to associate commits with users. The emails are not verified and don't have to be valid email addresses. They are assigned on a first come, first serve basis. This addresses http://feedback.gitlab.com/forums/176466-general/suggestions/3692666-ability-to-have-multiple-email-address. | ||||
| | | * | | Add email aliases for users | Jason Hollingsworth | 2014-02-13 | 27 | -46/+424 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | Emails are used to associate commits with users. The emails are not verified and don't have to be valid email addresses. They are assigned on a first come, first serve basis. Notifications are sent when an email is added. | ||||
| * | | | 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 | ||||
| | | * | | 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 | ||||
| | | * | | 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. | ||||
| | | * | 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 |
| |\ \ \ | | | | | | | | | | | | | Remove Backtics In Anchor Text | ||||
| | * | | | 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 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | Add documentation for MR workflow | ||||
| | * | | | 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. | ||||
| | * | | | 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 | ||||
| | * | | | 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 |
| |\ \ \ | |/ / |/| | | | | | Remove Gem Button | ||||
| | * | | 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 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Refactor Compare logic Updated gitlab_git to version 5.4.0. Fixes MR diff download link in case of huge diff. Fixes #1026 | ||||
| | * | | Fix link for MR diff download | Dmitriy Zaporozhets | 2014-02-12 | 1 | -5/+7 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Improve compare logic for EmailOnPush service | Dmitriy Zaporozhets | 2014-02-12 | 4 | -2/+13 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Use gitlab_git 5.4.0 without BROKEN_DIFF constant | Dmitriy Zaporozhets | 2014-02-12 | 4 | -13/+7 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Merge branch 'markup-dependencies' into 'master' | Dmitriy Zaporozhets | 2014-02-12 | 1 | -0/+4 |
| |\ \ \ | |/ / |/| | | | | | Markup Dependencies | ||||
| | * | | 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 | ||||
| | * | | Fix spelling of "GitLab" in HipChat service | Samuel D. Leslie | 2014-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | Pedantic, but it frustrates OCD people like myself :) | ||||
| * | | | 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 | ||||
| | * | | | add rake gitlab:import: all_users_to_all_groups and user_to_groups | Gabe Martin-Dempesy | 2013-11-02 | 2 | -0/+40 |
| | | | | | | | | | | | | | | | | | I opted for admins to be added as "owners" instead of "masters" because project masters can managers members, but only group owners can manage members. | ||||
| * | | | | 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). Just a minor spelling error. | ||||
| | | * | | | | 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 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | Split the user ssh keys by newline, not the characters "\n" | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |