summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Let members be invited from Add members pane.Douwe Maan2015-04-143-3/+9
|
* Add invites controller.Douwe Maan2015-04-149-0/+77
|
* Correctly render invite members without user.Douwe Maan2015-04-145-29/+62
|
* Reference project members by id instead of user_id.Douwe Maan2015-04-142-3/+3
|
* Rename manage_group ability to admin_group for consistency with project.Douwe Maan2015-04-146-6/+6
|
* Merge branch 'revert_fix_email_images' into 'master'Douwe Maan2015-04-143-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'fix_email_images' into 'master'" This reverts commit d66148ef393f1748c669c934eec4e928d92ef36a, reversing changes made to cdb64a81a8ca96961033b8ab06d5191ef5449634. This change needed to be reverted, because not enough email clients support inline images. /cc @DouweM As discussed before. I'll try to create a MR to allow access to all images this week. I'm a bit busy at the moment so no guarantees. ;) See merge request !513
| * Revert "Merge branch 'fix_email_images' into 'master'"Hannes Rosenögger2015-04-133-3/+3
| | | | | | | | | | | | | | | | This reverts commit d66148ef393f1748c669c934eec4e928d92ef36a, reversing changes made to cdb64a81a8ca96961033b8ab06d5191ef5449634. This change needed to be reverted, because not enough email clients support inline images.
* | Merge branch 'empty-avatar-alt-text' into 'master'Hannes Rosenögger2015-04-138-9/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly set image alt to prevent graphical glitches Rails image_tag sets the alt-attribute to the filename which causes graphical glitches if the file could not be loaded. Fixes https://github.com/gitlabhq/gitlabhq/issues/6036. Signed-off-by: Sven Strickroth <email@cs-ware.de> See merge request !503
| * | Explicitly set image alt to prevent graphical glitchesSven Strickroth2015-04-138-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Rails image_tag sets the alt-attribute to the filename which causes graphical glitches if the file could not be loaded. Fixes https://github.com/gitlabhq/gitlabhq/issues/6036. Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | Merge branch 'remove-sidebar-help-link' into 'master'Hannes Rosenögger2015-04-131-5/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed help link from sidebar Closes #1349 I don't see the point in having two links on the page that will do the same thing. See merge request !483
| * | | Removed help link from sidebarPhil Hughes2015-03-311-5/+0
| | | |
* | | | Merge branch 'reference-access-control' into 'master'Dmitriy Zaporozhets2015-04-132-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only allow users to reference groups, projects, issues, MRs, commits they have access to. Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183. See merge request !1742
| * | | | Only allow user to see participants from groups they have access to.Douwe Maan2015-04-022-4/+4
| | | | |
* | | | | Fix performance issue when browse big diffsDmitriy Zaporozhets2015-04-131-1/+1
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'public-deploy-keys' into 'master'Dmitriy Zaporozhets2015-04-136-16/+128
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow admin to create public deploy keys that are accessible to any project. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774. Project settings: ![Screen_Shot_2015-03-27_at_14.46.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01799ff912671ba6db3f828ea1aca1a6/Screen_Shot_2015-03-27_at_14.46.48.png) The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown. The list of projects below the public key has been changed to only show projects the user has access to. "Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys. Admin index: ![Screen_Shot_2015-03-27_at_14.47.06](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ea889d274cfd3f0694d47d602f4f3e94/Screen_Shot_2015-03-27_at_14.47.06.png) Admin detail page: ![Screen_Shot_2015-03-27_at_14.47.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8c8475e05bf6b497da3b9f1bc102329f/Screen_Shot_2015-03-27_at_14.47.16.png) Projects using the deploy key are listed on the left and can be disabled easily. See merge request !469
| * | | | Clean up code.Douwe Maan2015-04-032-12/+7
| | | | |
| * | | | Allow admin to create public deploy keys that are accessible to any project.Douwe Maan2015-04-036-14/+131
| | | | |
* | | | | Merge branch 'fix-group-project-list-cache' into 'master'Dmitriy Zaporozhets2015-04-131-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bust group page project list cache when namespace name or path changes. Fixes gitlab-com/support-forum#144. See merge request !509
| * | | | | Bust group page project list cache when namespace name or path changes.fix-group-project-list-cacheDouwe Maan2015-04-101-1/+1
| | | | | |
* | | | | | Fix typoStan Hu2015-04-111-1/+1
|/ / / / /
* | | | | Move current user to the top of the list in author/assignee filtersStan Hu2015-04-092-3/+3
| | | | | | | | | | | | | | | | | | | | Closes #1321
* | | | | Merge branch 'project-file-tabs' into 'master'Dmitriy Zaporozhets2015-04-081-14/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move project file links to tab bar. The sidebar was getting awfully crowded, so I moved the file links to the tab bar alongside Activity and Readme. Unlike Readme, these files are not actually loaded in a tab, but simply link to the relevant blob, because we don't want to unnecessarily load the potentially large changelog or contribution guide on every project page load. ![Screen_Shot_2015-04-06_at_15.04.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/962e8073ab6dc8797f93ee754eb275ed/Screen_Shot_2015-04-06_at_15.04.21.png) See merge request !497
| * | | | | Move project file links to tab bar.project-file-tabsDouwe Maan2015-04-061-14/+15
| | | | | |
* | | | | | Merge branch 'rs-application-form-messages' into 'master'Dmitriy Zaporozhets2015-04-081-4/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the "New Application" form's error messages visible Prior, if you submit the form without values the error text and the form fields were white-on-white: ![Screen_Shot_2015-04-01_at_8.25.56_PM](https://dev.gitlab.org/gitlab/gitlabhq/uploads/17eb44e65fc9c5ddd4a529e3927cd9b6/Screen_Shot_2015-04-01_at_8.25.56_PM.png) After: ![Screen_Shot_2015-04-06_at_10.13.07_PM](https://dev.gitlab.org/gitlab/gitlabhq/uploads/be53d6971ec1c34f415e75a0307b6577/Screen_Shot_2015-04-06_at_10.13.07_PM.png) See merge request !1752
| * | | | | | Make the New Application form's error messages visibleRobert Speicher2015-04-071-4/+6
| | | | | | |
* | | | | | | Merge branch 'rs-signup-box-text' into 'master'Dmitriy Zaporozhets2015-04-081-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve wording below signup box Before: ![Screen_Shot_2015-04-07_at_5.46.31_PM](https://dev.gitlab.org/gitlab/gitlabhq/uploads/a5433c7c423fd37cffe4c2352a833dcf/Screen_Shot_2015-04-07_at_5.46.31_PM.png) After: ![Screen_Shot_2015-04-07_at_5.45.05_PM](https://dev.gitlab.org/gitlab/gitlabhq/uploads/46e13756a8dc389e6f87de0097433e36/Screen_Shot_2015-04-07_at_5.45.05_PM.png) See merge request !1755
| * | | | | | | Improve wording below signup boxRobert Speicher2015-04-071-2/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-084-10/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'add-menu-icons' into 'master'Dmitriy Zaporozhets2015-04-071-4/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add icons to Add dropdown items. Before: ![Screen_Shot_2015-04-06_at_15.15.44](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a9f7d2e5dbd604fe7dff03cd7e47860e/Screen_Shot_2015-04-06_at_15.15.44.png) After: ![Screen_Shot_2015-04-06_at_15.15.34](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c5be6cdbe32d1064da7497a1879a9eb3/Screen_Shot_2015-04-06_at_15.15.34.png) See merge request !498
| | * | | | | Add icons to Add dropdown items.add-menu-iconsDouwe Maan2015-04-061-4/+8
| | |/ / / /
| * | | | | Merge branch 'emailsonpush-last-line' into 'master'Dmitriy Zaporozhets2015-04-072-4/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix final line in EmailsOnPush email diff being rendered as error. Fixes https://github.com/gitlabhq/gitlabhq/issues/8976 and private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2194. Pulls in gitlab_git 7.1.5, which includes https://gitlab.com/gitlab-org/gitlab_git/merge_requests/18. See merge request !480
| | * | | | | Move EmailsOnPush highlight CSS inline instead of being in every ↵Douwe Maan2015-03-312-4/+2
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | notification email.
| * | | | | Merge branch 'import-event' into 'master'Dmitriy Zaporozhets2015-04-071-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add event to activity feed for imported projects. ![Screen_Shot_2015-04-06_at_14.51.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/07fd16cb558873d2a6fb6c3cfcfdb227/Screen_Shot_2015-04-06_at_14.51.16.png) See merge request !496
| | * | | | | Change text of project creation event for imports.import-eventDouwe Maan2015-04-061-2/+2
| | | |/ / / | | |/| | |
* | | | | | Merge branch 'rs-issue-2088' into 'master'Dmitriy Zaporozhets2015-04-071-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lower the pointHitDetectionRadius for commit charts Needed to update the Chart.js dependency as well. Fixes #2088 See merge request !1749
| * | | | | Lower the pointHitDetectionRadius for commit chartsRobert Speicher2015-04-071-3/+3
| | |_|_|/ | |/| | | | | | | | | | | | | Fixes #2088
* | | | | remove extra scrollbar on background jobsBen Bodenmiller2015-04-041-1/+1
| |/ / / |/| | |
* | | | Merge remote-tracking branch 'github.com/master'Douwe Maan2015-04-041-1/+1
|\ \ \ \
| * | | | Fix and improve help renderingSullivan SENECHAL2015-04-031-1/+1
| |/ / /
* | | | Merge branch 'fix-admin-project-urls' into 'master'Drew Blessing2015-04-031-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link paths for http and ssh in the admin project show view are incorrect The link paths for http and ssh in the admin project show view are incorrect. Clicking on them effectively reloads the page. I think the intent is to have the links point to the project dashboard. Incorrect: http://gitlab.example.com/admin/projects/[namespace]/[project] Correct: http://gitlab.example.com/[namespace]/[project] See merge request !214
| * | | Fix link paths for http and ssh in admin project show viewJeremy Maziarz2014-10-061-2/+2
| | | |
* | | | Support configurable attachment size via Application SettingsStan Hu2015-04-022-1/+6
| |/ / |/| | | | | | | | | | | | | | Fix bug where error messages from Dropzone would not be displayed on the issues page Closes #1258
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-03-318-62/+63
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: lib/gitlab/markdown.rb
| * \ \ Merge branch 'admin-user-projects' into 'master'Dmitriy Zaporozhets2015-04-012-5/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix admin user projects lists. The admin user personal projects lists wasn't being rendered anymore. cc @marin See merge request !442
| | * | | Fix admin user projects lists.admin-user-projectsDouwe Maan2015-03-312-5/+5
| | | | |
| * | | | Merge branch 'refactor-milestones' into 'master'Dmitriy Zaporozhets2015-04-015-56/+57
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better looking milestone lists ### Before ![milestone-before](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1366ade74d76b067fdc8707d31d2bffc/milestone-before.png) ### After ![milestone-after](https://gitlab.com/gitlab-org/gitlab-ce/uploads/80ae1c1f77eae5dff8ee61c4271bec17/milestone-after.png) See merge request !484
| | * | | Better looking milestone listsDmitriy Zaporozhets2015-04-015-56/+57
| | | | |
| * | | | Merge branch 'file-commit-list' into 'master'Douwe Maan2015-03-311-1/+1
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue where only 25 commits would load in file listings Fixes #1310 See https://gitlab.com/gitlab-org/gitlab-ce/tree/master and it will only show the first 25 files commit messages. See merge request !477
| | * | | Fixed issue where only 25 commits would load in file listingsPhil Hughes2015-03-301-1/+1
| | | | |
* | | | | Merge branch 'email-full-url'Marin Jankovski2015-03-315-5/+5
|\ \ \ \ \ | |/ / / / |/| | | |