summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffsJacob Vosmaer2016-03-0346-406/+401
|\
| * Merge branch 'improve-user-tabs' into 'master' Jacob Schatz2016-03-033-105/+105
| |\ | | | | | | | | | | | | | | | | | | Add routes and actions for dynamic tab loading. Closes #13588 and #13584 See merge request !2961
| | * Provide defaults and make sure we everything is container into a parent elementAlfredo Sumaran2016-03-021-96/+97
| | |
| | * Message for when no groups foundAlfredo Sumaran2016-03-011-0/+2
| | |
| | * Add required classname for specAlfredo Sumaran2016-03-011-1/+1
| | |
| | * Merge branch 'master' into improve-user-tabsAlfredo Sumaran2016-03-0110-24/+21
| | |\
| | * | Remove unneded call to missing librayAlfredo Sumaran2016-03-011-3/+0
| | | |
| | * | Rename attribute from url to href for consistencyAlfredo Sumaran2016-03-011-1/+1
| | | |
| | * | Specify path to be used for @Page to load user activityAlfredo Sumaran2016-03-011-2/+2
| | | |
| | * | Make url and actions to be the same nameAlfredo Sumaran2016-03-011-3/+3
| | | |
| | * | Activate tab according URLAlfredo Sumaran2016-03-011-7/+7
| | | |
| | * | Initialize User class on the viewAlfredo Sumaran2016-03-011-0/+7
| | | |
| | * | Let User class handle resource loadingAlfredo Sumaran2016-02-291-4/+1
| | | |
| | * | Tidy htmlAlfredo Sumaran2016-02-291-30/+18
| | | |
| | * | Add ul to wrap project listAlfredo Sumaran2016-02-291-2/+3
| | | |
| | * | Add routes and actions for dynamic tab loadingJosh Frye2016-02-294-33/+40
| | | |
| * | | Change `js-quick-submit` behavior to expect the class on the formRobert Speicher2016-03-0220-33/+33
| | | | | | | | | | | | | | | | | | | | Now it will work on any field inside that form, and it's easier to scope new behavior, which is what we're adding next!
| * | | Merge branch 'notification-settings' into 'master' Jacob Schatz2016-03-022-62/+62
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notifications settings UI Closes #13859 ![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/125e8e3b14319b6cf95e9aa31659681a/notification-settings.png) See merge request !3035
| | * | | Notifications settings UIPhil Hughes2016-03-022-62/+62
| | | | | | | | | | | | | | | | | | | | Closes #13859
| * | | | Merge branch 'preferences-view' into 'master' Jacob Schatz2016-03-021-49/+49
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preferences view Closes #13861 ![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/133ae7a1b4a0e931d5a6b19922eb2703/preferences-settings.png) See merge request !3036
| | * | | | Preferences viewPhil Hughes2016-03-021-49/+49
| | |/ / / | | | | | | | | | | | | | | | Closes #13861
| * | | | Merge branch 'audit-log-ui' into 'master' Jacob Schatz2016-03-022-20/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Audit log UI Closes #13862 ![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a6d6d1c3661173b95df9ec95f8e2f644/audit-log-settings.png) See merge request !3037
| | * | | | audit log UI updatePhil Hughes2016-03-022-20/+21
| | |/ / / | | | | | | | | | | | | | | | Closes #13862
| * | | | Merge branch 'issue_13501' into 'master' Robert Speicher2016-03-021-0/+4
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Add link to open merge requests on label index Closes #13501 See merge request !3057
| | * | | Add link to open merge requestsissue_13501Alfredo Sumaran2016-03-011-0/+4
| | | | |
| * | | | Merge branch 'profile-settings-ui' into 'master' Jacob Schatz2016-03-021-86/+81
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Profile settings Closes #13853 ![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4fb28f2598de6d9ca4e5be8595dbe863/profile-settings.png) See merge request !3038
| | * | | | Profile settingsPhil Hughes2016-03-021-86/+81
| | | | | | | | | | | | | | | | | | | | | | | | Closes #13853
| * | | | | Merge branch 'add_show_role_boolean_to_group_member_view' into 'master' Robert Speicher2016-03-021-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show group member roles if explicitly requested This very simply fixes an EE problem, but I made the change here so it's less prone to errors from merges. In EE, prior to this change, group member roles were shown in project member list when a project is shared with a group. This is bad because the project explicitly shares with the group and sets a 'max access' level. If the max access level is 'developer' the project owner doesn't want to see 'Owner' in the group roles because it will confuse them. I verified that permissions are really being honored here, it was just an error in the view. You can see in https://gitlab.com/gitlab-org/gitlab-ee/blob/master/app/views/projects/project_members/_shared_group_members.html.haml#L18 where this was how it was intended to be. Likely a CE-EE merge introduced this bug. That's why I made the boolean required in CE even though this is for EE. ## Before ![Screen_Shot_2016-03-01_at_8.59.02_AM](/uploads/704ab3149f60c363dd8374bd0c06a46a/Screen_Shot_2016-03-01_at_8.59.02_AM.png) ## After ![Screen_Shot_2016-03-01_at_9.17.54_AM](/uploads/5fcabef352cbc41dade037767f90ace3/Screen_Shot_2016-03-01_at_9.17.54_AM.png) See merge request !3044
| | * | | | | Only show group member roles if explicitly requestedDrew Blessing2016-03-011-1/+2
| | | | | | |
| * | | | | | Merge branch 'fix/13781-delete-tag-without-ajax' into 'master' Rémy Coutable2016-03-021-0/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tag deletion doesn't use AJAX anymore See merge request !2986
| | * | | | | | Make the tags delete button remote in the tags listfix/13781-delete-tag-without-ajaxRémy Coutable2016-03-012-1/+4
| | | | | | | |
| | * | | | | | Tag deletion doesn't use AJAX anymoreRémy Coutable2016-03-011-1/+1
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The controller was actually changed to not respond to AJAX but the deletion button in the index.html was still using AJAX. There is no need for AJAX when deleting a tag since it's a very rare use-case. KISS. Fixes #13781
| * | | | | | Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' ↵Douwe Maan2016-03-022-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Don't show "Welcome to GitLab" when the search didn't return any projects Fixes #13785. /cc @pixdrift ### Before ![Screen_Shot_2016-03-02_at_10.55.02](/uploads/b6b6ead2143d01e374ad296e72182d79/Screen_Shot_2016-03-02_at_10.55.02.png) ### After ![Screen_Shot_2016-03-02_at_12.12.33](/uploads/6e16c44e69039c534ea0fc3373c6060b/Screen_Shot_2016-03-02_at_12.12.33.png) See merge request !3059
| | * | | | | | Use the .nothing-here-block class when projects list is emptyfix/13785-dashboard-projects-display-welcome-after-searchRémy Coutable2016-03-021-1/+1
| | | | | | | |
| | * | | | | | Don't show "Welcome to GitLab" when the search didn't return any projectsRémy Coutable2016-03-021-1/+1
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'username-issue-header' into 'master' Jacob Schatz2016-03-022-0/+2
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added username to issue & merge request header Closes #13771 ## Issue header ![Screen_Shot_2016-03-01_at_16.59.32](/uploads/a112dfb91eb9b6f911c716265b35043c/Screen_Shot_2016-03-01_at_16.59.32.png) ## Merge request header ![Screen_Shot_2016-03-01_at_16.59.26](/uploads/67bf9e65ac5cae4667db6c5148cb57a0/Screen_Shot_2016-03-01_at_16.59.26.png) See merge request !3048
| | * | | | | Added username to issue & merge request headerusername-issue-headerPhil Hughes2016-03-012-0/+2
| | | |/ / / | | |/| | | | | | | | | | | | | | | Closes #13771
| * | | | | Show days remaining instead of elapsed time for Milestone.Rubén Dávila2016-03-011-3/+1
| | |/ / / | |/| | |
| * | | | Merge branch 'logged-out-search' into 'master' Robert Speicher2016-03-015-39/+30
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Logged out search Fixes #13676 See merge request !3045
| | * | | Refactor UI header for logged out usersDmitriy Zaporozhets2016-03-013-47/+28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Enable search for logged-out usersDmitriy Zaporozhets2016-03-013-2/+12
| | |/ / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix issue with overlap of sidebar links.Jacob Schatz2016-03-012-2/+2
| |/ /
| * | Changed page titlePhil Hughes2016-03-011-1/+1
| | |
| * | Fixed issue based on feedback with link text outputPhil Hughes2016-03-011-1/+1
| | |
| * | Removed un-used variablesPhil Hughes2016-03-011-1/+1
| | |
| * | Replaced prefix with to_reference method callsPhil Hughes2016-03-013-3/+3
| | |
| * | Changed # to ! on merge requests on activity viewPhil Hughes2016-03-013-3/+3
| | | | | | | | | | | | Closes #9082
* | | Use Gitlab::Git::Util.count_linesJacob Vosmaer2016-03-021-1/+1
| | |
* | | Use DiffCollection#overflow?Jacob Vosmaer2016-03-011-1/+1
| | |
* | | Remove dead codeJacob Vosmaer2016-03-011-7/+0
| | |
View Lorry Controller Status