summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Rename abilities to correspond contoller/model action namesrename-abilitiesDmitriy Zaporozhets2015-06-2625-42/+42
| | | | | | | | | | | | | | | | | write_ was renamed to create_ modify_ was renamed to update_ So now in update action we have next code def create can?(current_user, :create_issue, @issue) end def update can?(current_user, :update_issue, @issue) end Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Simplify set of assignee, milestone and label to admin_issue ruleDmitriy Zaporozhets2015-06-267-27/+8
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Update tests and use js-issuable class for context formDmitriy Zaporozhets2015-06-264-4/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* UsersSelect is part of filter so I rather keep js executed in partialDmitriy Zaporozhets2015-06-252-7/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix js error on merge request pageDmitriy Zaporozhets2015-06-251-1/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Dont allow set assignee, milestone or labels if user is guestDmitriy Zaporozhets2015-06-255-0/+18
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move duplicate js functionality into IssuableFormDmitriy Zaporozhets2015-06-252-8/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor issue and merge request sidebarDmitriy Zaporozhets2015-06-2514-161/+89
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Dont allow guest to set assigne, milestone and label when create new issue ↵Dmitriy Zaporozhets2015-06-252-37/+43
| | | | | | or merge request Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move issuable partials in common directoryDmitriy Zaporozhets2015-06-2512-11/+11
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-252-44/+37
|\
| * Have sidebar labels disappear behind content instead of hide immediately.sidebar-animationDouwe Maan2015-06-252-44/+37
| |
* | prettier highlighting of active link in the sidebarJob van der Voort2015-06-251-1/+1
|/
* Merge branch 'rs-random-placeholder-tip' into 'master'Dmitriy Zaporozhets2015-06-253-24/+28
|\ | | | | | | | | | | | | | | Show a random Markdown tip in the textarea placeholder cc @darby See merge request !879
| * Prefix random Markdown tips with "Tip:"rs-random-placeholder-tipRobert Speicher2015-06-241-1/+1
| |
| * Show a random Markdown tip in the textarea placeholderRobert Speicher2015-06-233-24/+28
| |
* | Merge branch 'project_icon_removal' into 'master'Dmitriy Zaporozhets2015-06-251-2/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the icons from the New Issue and New Project buttons Fixes #1869 No more icons! See merge request !885
| * | Removed the icons from the New Issue and New Project buttonsproject_icon_removalDarby2015-06-241-2/+0
| | |
* | | Merge branch 'performance-improvements' into 'master'Dmitriy Zaporozhets2015-06-258-15/+31
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Performance improvements * store @participants in variable * store result of subscribed? call into variable In total it reduce amount of SQL queries for issue or merge_request with 10 comments/participants almost twice. See merge request !883
| * | Improve performance for merge_request#show pageDmitriy Zaporozhets2015-06-243-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * store @participants in variable * store result of subscribed? call into variable In total it reduce amount of SQL queries for merge_request with 10 comments/participants twice. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Improve performance for issue#show pageDmitriy Zaporozhets2015-06-244-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | * store @participants in variable * store result of subscribed? call into variable In total it reduce amount of SQL queries for issue with 10 comments/participants twice. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Enable rack profiler by defaultDmitriy Zaporozhets2015-06-241-0/+9
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Updated merge request merged web hook to correctly fire action=merged.Adam Meily2015-06-241-1/+1
| | | | | | | | | | | | | | | Fixes #879 Fixes #498
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-242-2/+8
|\ \ \
| * \ \ Merge branch 'explicit_error_ci' into 'master'Dmitriy Zaporozhets2015-06-242-2/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicit error when commit not found in the GitLab CI !!! SHOULD BE MERGED WITH https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/159 https://dev.gitlab.org/gitlab/gitlab-ci/issues/280 See merge request !871
| | * | | Explicit error when commit not found in the GitLab CIValery Sizov2015-06-232-2/+8
| | | | |
* | | | | Merge branch 'stop-jumping' into 'master'Dmitriy Zaporozhets2015-06-241-5/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stop jumping all content on collapsing and expanding the sidebar When you collapse or expand the sidebar, all content shifts with 5px. This merge request solves that. cc @darby See merge request !1877
| * | | | stop jumping all content on collapsing and expanding the sidebarJob van der Voort2015-06-241-5/+1
| | |/ / | |/| |
* | | | Merge branch 'rs-issue-1850' into 'master'Douwe Maan2015-06-242-10/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only look up Commit authors/committers by email - Removes looking up authors/committers by name - Renames `User.find_for_commit` to `User.find_by_any_email` Closes #1850 See merge request !878
| * | | Only look up Commit authors/committers by emailrs-issue-1850Robert Speicher2015-06-232-10/+6
| | |/ | |/| | | | | | | | | | - Removes looking up authors/committers by name - Renames `User.find_for_commit` to `User.find_by_any_email`
* | | Merge branch 'application_settings_form' into 'master'Dmitriy Zaporozhets2015-06-242-53/+57
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated the categories of Application Settings Form Changed the categories and order of the application settings accessible by admin/application_settings Link to issue: https://dev.gitlab.org/gitlab/gitlabhq/issues/2412 Issue will be closed upon approval of this merge request. Fixes #2412 See merge request !877
| * | | Changed the placement of Restricted Domainsapplication_settings_formDarby2015-06-231-6/+8
| | | |
| * | | Updated the categories of Application Settings FormDarby2015-06-232-54/+56
| |/ /
* | | Allow user to remove public email addressrs-dev-issue-2419Robert Speicher2015-06-231-1/+3
|/ /
* | Merge branch 'admin-edit-identities' into 'master'Dmitriy Zaporozhets2015-06-2311-237/+339
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Admin can see, edit and remove user identities Related to #1415 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2224 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !843
| * \ Merge branch 'master' into admin-edit-identitiesadmin-edit-identitiesDmitriy Zaporozhets2015-06-236-36/+62
| |\ \
| * | | Set proper title when edit identity from admin areaDmitriy Zaporozhets2015-06-231-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix admin identities codeDmitriy Zaporozhets2015-06-232-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix code style issueDmitriy Zaporozhets2015-06-221-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Address review commentsDmitriy Zaporozhets2015-06-221-7/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'master' into admin-edit-identitiesDmitriy Zaporozhets2015-06-2256-301/+539
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/admin/users/show.html.haml
| * | | | Fix indendity testDmitriy Zaporozhets2015-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Refactor admin user pageDmitriy Zaporozhets2015-06-227-235/+242
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Make provider a select for identities form in admin areaDmitriy Zaporozhets2015-06-221-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Minor improvements to admin identities textDmitriy Zaporozhets2015-06-222-4/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Move identities list to own controller actionDmitriy Zaporozhets2015-06-193-17/+24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add ability for admin to edit user identityDmitriy Zaporozhets2015-06-194-4/+50
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Admin can see and remove user identitiesDmitriy Zaporozhets2015-06-193-0/+46
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'fix-delete-user-error' into 'master'Dmitriy Zaporozhets2015-06-233-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error when deleting a user who has projects ### What does this MR do? This MR fixes an error that prevented users from being deleted in the Admin page if the user had personal projects. ### Why was this MR needed? Deleting a user who had projects would result in an error such as this: ``` Started DELETE "/admin/users/tdb1" for MYIP at 2015-06-22 20:53:02 +0100 Processing by Admin::UsersController#destroy as HTML Parameters: {"authenticity_token"=>"[FILTERED]", "id"=>"tdb1"} Completed 500 Internal Server Error in 30ms (ActiveRecord: 6.7ms) NameError (undefined local variable or method `current_user' for #<DeleteUserService:0x0000000cd01d38>): app/services/delete_user_service.rb:10:in `block in execute' app/services/delete_user_service.rb:7:in `execute' app/controllers/admin/users_controller.rb:89:in `destroy' ``` ### What are the relevant issue numbers? * Closes #1856 * Closes https://github.com/gitlabhq/gitlabhq/issues/9394 See merge request !868
| * | | | | Fix error when deleting a user who has projectsStan Hu2015-06-233-2/+8
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Closes #1856 Closes https://github.com/gitlabhq/gitlabhq/issues/9394
View Lorry Controller Status