summaryrefslogtreecommitdiff
path: root/app/views/projects
Commit message (Collapse)AuthorAgeFilesLines
* Rename abilities to correspond contoller/model action namesrename-abilitiesDmitriy Zaporozhets2015-06-2616-20/+20
| | | | | | | | | | | | | | | | | 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-261-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Update tests and use js-issuable class for context formDmitriy Zaporozhets2015-06-261-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor issue and merge request sidebarDmitriy Zaporozhets2015-06-258-124/+9
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move issuable partials in common directoryDmitriy Zaporozhets2015-06-256-122/+7
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'rs-random-placeholder-tip' into 'master'Dmitriy Zaporozhets2015-06-251-1/+1
|\ | | | | | | | | | | | | | | Show a random Markdown tip in the textarea placeholder cc @darby See merge request !879
| * Show a random Markdown tip in the textarea placeholderRobert Speicher2015-06-231-1/+1
| |
* | 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-254-12/+14
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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-242-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-242-6/+7
| |/ | | | | | | | | | | | | | | | | * 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>
* | Explicit error when commit not found in the GitLab CIValery Sizov2015-06-231-0/+6
|/
* Merge branch 'revert-mr-state-names'Dmitriy Zaporozhets2015-06-225-12/+7
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/merge_requests.rb
| * Fix closed merge request scope at milestone pageDmitriy Zaporozhets2015-06-221-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Revert merge request states renamingDmitriy Zaporozhets2015-06-195-11/+6
| | | | | | | | | | | | | | | | Replaced: * "Accepted" with "Merged" * "Rejected" with "Closed" Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'rs-dev-issue-2355' into 'master'Dmitriy Zaporozhets2015-06-227-11/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequest#show performance improvements This is a first pass on improving the performance of the `MergeRequests#show` page. Notable changes: - The "Commits" tab is loaded lazily, so the initial page load should be much faster for MRs with many commits. - Relative timestamps via `timeago` are only initialized once per load instead of `O(n^2)`. This greatly improves frontend rendering times for a large number of commits. - Refactored `User.find_for_commit` to use a single ARel-generated SQL query instead of the old method which resulted in one query, and could result in up to three. See merge request !838
| * | Use `skip_js` for commit timestampsRobert Speicher2015-06-171-1/+1
| | | | | | | | | | | | This greatly improves frontend rendering times.
| * | Load the Merge Request > Commits tab lazilyRobert Speicher2015-06-171-2/+2
| | |
| * | Update time_ago_with_tooltip helperRobert Speicher2015-06-175-8/+8
| | | | | | | | | | | | Minor refactoring, add specs, changes arguments to use keywords.
* | | Disable changing of target branch in new merge request page when a branch ↵Stan Hu2015-06-191-6/+7
| |/ |/| | | | | | | | | has already been specified Closes #1830
* | Revert "Changed the placeholder text and modified the css class to make it ↵revert-placeholderDarby2015-06-181-1/+1
|/ | | | | | visible" This reverts commit c39c823421e9dfd3add4cb49a82fa32831797aa0.
* Merge branch 'placeholder_text'Dmitriy Zaporozhets2015-06-171-1/+1
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: Gemfile.lock
| * Changed the placeholder text and modified the css class to make it visibleplaceholder_textDarby2015-06-161-1/+1
| |
* | Bootlint: Modals no longer need a '.hide' classRobert Speicher2015-06-166-6/+6
| |
* | Bootlint: Use offset grid classes instead of empty divsRobert Speicher2015-06-165-8/+5
| |
* | Support commenting on a diff in side-by-side viewStan Hu2015-06-165-20/+26
|/ | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9283
* Merge branch 'remove-activity-feed-text' into 'master'Dmitriy Zaporozhets2015-06-121-1/+0
|\ | | | | | | | | | | Remove text since rss is now to prominent. See merge request !1855
| * Remove text since rss is now to prominent.Sytse Sijbrandij2015-06-121-1/+0
| |
* | Merge branch 'refactor-mr-widget' into 'master'Dmitriy Zaporozhets2015-06-1222-200/+229
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor accept merge request widget * make each case a simple view * separate merge request JS from merge request accept widget JS Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !799
| * | Fix automergeDmitriy Zaporozhets2015-06-111-4/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Improve variables in mr widgetDmitriy Zaporozhets2015-06-113-3/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Extract merge request widget JS to separate classDmitriy Zaporozhets2015-06-118-17/+38
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Refactor merge request widget step 2Dmitriy Zaporozhets2015-06-1114-50/+46
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Refactor accept merge request widgetDmitriy Zaporozhets2015-06-1122-191/+204
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add negative tabindex to Markdown Write and Preview tabsrs-issue-1757Robert Speicher2015-06-101-2/+2
|/ | | | Closes #1757
* Improve project edit formDmitriy Zaporozhets2015-06-101-17/+25
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Improve UI for phonesDmitriy Zaporozhets2015-06-081-3/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Dont use fixed pixel size if form controls - its bad for mobile devicesDmitriy Zaporozhets2015-06-081-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Dont truncate issue/mr titleDmitriy Zaporozhets2015-06-082-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'refactor-web-editor' into 'master'Dmitriy Zaporozhets2015-06-051-5/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor web editor * fix problem with editing non-master branch * before commit make sure branch exists * dont allow user change file in one branch and commit to another existing branch * remove a lot of code duplication * remove outdated statellite errors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #1761 See merge request !773
| * Refactor web editorrefactor-web-editorDmitriy Zaporozhets2015-06-051-5/+6
| | | | | | | | | | | | | | | | | | | | * fix problem with editing non-master branch * before commit make sure branch exists * dont allow user change file in one branch and commit to another existing branch * remove a lot of code duplication * remove outdated statellite errors Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'warn-about-referenced-users' into 'master'Dmitriy Zaporozhets2015-06-058-30/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show warning when a comment will add 10 or more people to the discussion. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2054 New issue: ![Screen_Shot_2015-06-02_at_14.48.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6771ff8748b9b548a9f0f32a5a8b9bb1/Screen_Shot_2015-06-02_at_14.48.46.png) New comment: ![Screen_Shot_2015-06-02_at_14.48.51](https://gitlab.com/gitlab-org/gitlab-ce/uploads/25ec5f06490e1e6b36e453e055a7b403/Screen_Shot_2015-06-02_at_14.48.51.png) See merge request !754
| * | Prefer jQuery on to bind, and don't use .js class.warn-about-referenced-usersDouwe Maan2015-06-051-1/+1
| | |
| * | Show warning when a comment will add 10 or more people to the discussion.Douwe Maan2015-06-058-30/+27
| |/
* | Add info about WIP merge requests to docs.wip-mr-docsDouwe Maan2015-06-051-3/+3
|/
* Merge branch 'fix-no-labels-page' into 'master'Dmitriy Zaporozhets2015-06-041-1/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Omit link to generate labels if user does not have access to create them On a project that has no labels, a user was provided a link to create labels on the "Labels" tab, resulting in a 404. This MR changes the next to "No labels created" if the user lands on this page but does not have permission to add a label. Screenshot: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/cb04659cf3a0abe1e072cb78d0964b94/image.png) Closes https://github.com/gitlabhq/gitlabhq/issues/8353 See merge request !752
| * Omit link to generate labels if user does not have access to create themStan Hu2015-06-011-1/+4
| | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/8353
* | Show key fingerprint on DeployKeys#indexrs-issue-1741Robert Speicher2015-06-031-10/+6
| | | | | | | | Also style all key fingerprints consistently across the app.
* | Remove show actions from Admin and Project DeployKeysRobert Speicher2015-06-031-14/+0
| |
View Lorry Controller Status