summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Rename abilities to correspond contoller/model action namesrename-abilitiesDmitriy Zaporozhets2015-06-2625-42/+42
* Simplify set of assignee, milestone and label to admin_issue ruleDmitriy Zaporozhets2015-06-267-27/+8
* Update tests and use js-issuable class for context formDmitriy Zaporozhets2015-06-264-4/+4
* UsersSelect is part of filter so I rather keep js executed in partialDmitriy Zaporozhets2015-06-252-7/+2
* Fix js error on merge request pageDmitriy Zaporozhets2015-06-251-1/+0
* Dont allow set assignee, milestone or labels if user is guestDmitriy Zaporozhets2015-06-255-0/+18
* Move duplicate js functionality into IssuableFormDmitriy Zaporozhets2015-06-252-8/+6
* Refactor issue and merge request sidebarDmitriy Zaporozhets2015-06-2514-161/+89
* Dont allow guest to set assigne, milestone and label when create new issue or...Dmitriy Zaporozhets2015-06-252-37/+43
* Move issuable partials in common directoryDmitriy Zaporozhets2015-06-2512-11/+11
* 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
|\
| * 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 buttonsproject_icon_removalDarby2015-06-241-2/+0
* | | Merge branch 'performance-improvements' into 'master'Dmitriy Zaporozhets2015-06-258-15/+31
|\ \ \ | |/ / |/| |
| * | Improve performance for merge_request#show pageDmitriy Zaporozhets2015-06-243-6/+9
| * | Improve performance for issue#show pageDmitriy Zaporozhets2015-06-244-9/+13
| * | Enable rack profiler by defaultDmitriy Zaporozhets2015-06-241-0/+9
* | | Updated merge request merged web hook to correctly fire action=merged.Adam Meily2015-06-241-1/+1
* | | 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 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 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 emailrs-issue-1850Robert Speicher2015-06-232-10/+6
| | |/ | |/|
* | | Merge branch 'application_settings_form' into 'master'Dmitriy Zaporozhets2015-06-242-53/+57
|\ \ \
| * | | 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
|\ \
| * \ 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
| * | | Fix admin identities codeDmitriy Zaporozhets2015-06-232-2/+2
| * | | Fix code style issueDmitriy Zaporozhets2015-06-221-1/+1
| * | | Address review commentsDmitriy Zaporozhets2015-06-221-7/+5
| * | | Merge branch 'master' into admin-edit-identitiesDmitriy Zaporozhets2015-06-2256-301/+539
| |\ \ \
| * | | | Fix indendity testDmitriy Zaporozhets2015-06-221-1/+1
| * | | | Refactor admin user pageDmitriy Zaporozhets2015-06-227-235/+242
| * | | | Make provider a select for identities form in admin areaDmitriy Zaporozhets2015-06-221-3/+3
| * | | | Minor improvements to admin identities textDmitriy Zaporozhets2015-06-222-4/+2
| * | | | Move identities list to own controller actionDmitriy Zaporozhets2015-06-193-17/+24
| * | | | Add ability for admin to edit user identityDmitriy Zaporozhets2015-06-194-4/+50
| * | | | Admin can see and remove user identitiesDmitriy Zaporozhets2015-06-193-0/+46
* | | | | Merge branch 'fix-delete-user-error' into 'master'Dmitriy Zaporozhets2015-06-233-2/+8
|\ \ \ \ \
| * | | | | Fix error when deleting a user who has projectsStan Hu2015-06-233-2/+8
| | |_|_|/ | |/| | |