summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Fixed revert button tooltip placement causing movementfix-moving-revert-buttonPhil Hughes2016-02-221-2/+2
|
* "X assigned you Y" instead of "X assigned Y"Douwe Maan2016-02-201-0/+7
|
* Add "Mark all as done" buttonDouwe Maan2016-02-201-0/+26
|
* Include 'issue'/'merge request' in linkDouwe Maan2016-02-201-8/+3
|
* Rename Tasks to TodosDouglas Barbosa Alexandre2016-02-202-69/+59
|
* Refactoring TasksHelperDouglas Barbosa Alexandre2016-02-201-8/+1
|
* Refactoring task queue partialsDouglas Barbosa Alexandre2016-02-201-5/+7
|
* Fix rubocop offensesDouglas Barbosa Alexandre2016-02-201-1/+1
|
* Add filters by project, author, type, and action to task queue page listDouglas Barbosa Alexandre2016-02-201-0/+33
|
* Create a pending task when a user is mentioned on a noteDouglas Barbosa Alexandre2016-02-201-0/+16
|
* Add pending tasks badge on top right next to the new and logout buttonDouglas Barbosa Alexandre2016-02-201-0/+8
|
* Add tasks queue list pageDouglas Barbosa Alexandre2016-02-201-0/+17
|
* Merge branch 'rs-blob' into 'master' Douwe Maan2016-02-201-4/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `Blob` model that wraps `Gitlab::Git::Blob` This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG. See merge request !2887
| * Add a `Blob` model that wraps `Gitlab::Git::Blob`rs-blobRobert Speicher2016-02-181-4/+0
| | | | | | | | | | | | | | | | | | | | | | This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG.
* | Some updates from last code review.Rubén Dávila2016-02-191-2/+2
| |
* | Make #commit_with_hooks return the new obj id plus some other fixes.Rubén Dávila2016-02-191-4/+14
| |
* | Refactor revert_commit_link helper.Rubén Dávila2016-02-192-8/+2
| |
* | No longer need to ignore temporary branch.Rubén Dávila2016-02-191-2/+0
| | | | | | | | | | * Now it's only created when user choose to create a MR and logic to hide it is handled by https://gitlab.com/gitlab-org/gitlab-ce/blob/50595af7b0e304f16e2955109abd2d25cd96efda/app/helpers/application_helper.rb#L139
* | Fix build and add specsRubén Dávila2016-02-191-7/+4
| |
* | Show a tooltip on revert link.Rubén Dávila2016-02-191-7/+5
| |
* | Move revert link to the MR widget section plus some refactor.Rubén Dávila2016-02-191-2/+2
| |
* | Some fixes and refactors for code related to forks.Rubén Dávila2016-02-191-0/+2
| |
* | Some updates after last code review.Rubén Dávila2016-02-193-9/+24
| |
* | Add link to fork if user can't revert MR.Rubén Dávila2016-02-191-0/+7
| |
* | Add button to revert commit on Commit detail page.Rubén Dávila2016-02-191-0/+7
| |
* | Some updates from last code review.Rubén Dávila2016-02-191-1/+1
| |
* | Don't show last event message on top when reverse branch was created under ↵Rubén Dávila2016-02-191-0/+2
| | | | | | | | the hood.
* | Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-191-6/+0
|\ \ | |/ |/| | | | | | | | | | | | | Update Gemojione for new hotness :sparkles: Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
| * Remove unused emoji_autocomplete_source helperRobert Speicher2016-02-121-6/+0
| |
* | Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' Douwe Maan2016-02-171-0/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to see and sort on vote count from Issues and MR lists Fixes #3763 * Sort options ![Sort Options](/uploads/df6543d574d4df8bf7e4496a876e2930/sort.png) * Most popular ![Most popular](/uploads/bb92cc2fbef7b6b806dcdf8c52778fdd/most-popular.png) * Least popular ![Least popular](/uploads/7988ed451922c81dc228419b5edbd7cd/least-popular.png) See merge request !2781
| * | Add ability to see and sort on vote count from Issues and MR listssee-and-sort-on-vote-count-mr-issuesDouglas Barbosa Alexandre2016-02-171-0/+18
| | |
* | | Sort line notes used in parallel diff by created_atRémy Coutable2016-02-171-1/+1
|/ / | | | | | | Fixes #13464.
* | Display "iid of max_iid" in Issuables' sidebarRémy Coutable2016-02-161-8/+4
| |
* | Fix the "x of y" displayed at the top of Issuables' sidebarfix/13356-issuable-index-of-total-in-sidebarRémy Coutable2016-02-153-85/+44
| | | | | | | | | | | | | | | | 1. We now display the index of the current issuable among all its project's issuables, of the same type and with the same state. 2. Also, refactored a bit the Issuable helpers into a new IssuablesHelper module. 3. Added acceptance specs for the sidebar counter.
* | Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docsBen Boeckel2016-02-122-2/+16
|/ | | | | | | | - Apply the RelativeLinkFilter filter to other formats, e.g., reStructuredText so links from the Files view or the Project view work - Remove the AsciidocPipeline pipeline Fixes #3533.
* Fix milestone order in project and issue edit lists to due_dateolirogers/gitlab-ce-project-milestone-orderOliver Rogers2016-02-102-7/+3
|
* Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-02-091-1/+1
|\
| * Merge branch 'ci-permissions' into 'master' Robert Speicher2016-02-081-1/+1
| |\ | | | | | | | | | | | | | | | | | | Limit guest access to builds Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2646 See merge request !1942
| | * Merge branch 'master' into ci-permissionsKamil Trzcinski2016-02-054-15/+109
| | |\ | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | * \ Merge remote-tracking branch 'origin/master' into ci-permissionsKamil Trzcinski2016-02-044-7/+31
| | |\ \ | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/builds/index.html.haml
| | * | | Make the CI permission model simplerKamil Trzcinski2016-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR simplifies CI permission model: - read_build: allows to read a list of builds, artifacts and trace - update_build: allows to cancel and retry builds - create_build: allows to create builds from gitlab-ci.yml (not yet implemented) - admin_build: allows to manage triggers, runners and variables - read_commit_status: allows to read a list of commit statuses (including the overall of builds) - create_commit_status: allows to create a new commit status using API Remove all extra methods to manage permission. Made all controllers to use explicitly the new permissions.
* | | | | Merge branch 'rs-broadcast-markdown' into 'master' Douwe Maan2016-02-091-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow limited Markdown in Broadcast Messages Closes #11853 See merge request !2695
| * | | | | Allow limited Markdown in Broadcast Messagesrs-broadcast-markdownRobert Speicher2016-02-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Closes #11853
* | | | | | Merge branch 'snippet_search_refactoring'Valery Sizov2016-02-091-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Faster snippet searchValery Sizov2016-02-051-3/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'project-title-dropdown-toggle-button' into 'master' Jacob Schatz2016-02-051-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the project switcher dropdown toggle Moved the positioning of the dropdown to be more aligned with the title Closes #13219 and #13214 cc. @jschatz1 @dzaporozhets See merge request !2733
| * | | | Uses icon helper for dropdown toggle iconPhil Hughes2016-02-051-1/+1
| | | | |
| * | | | Changed the project switcher dropdown togglePhil Hughes2016-02-051-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | Moved the positioning of the dropdown to be more aligned with the title Closes #13219 and #13214
* | | | Merge branch 'bug/jschatz1/sidebar-issues' into 'master' Dmitriy Zaporozhets2016-02-051-2/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix diff and commit view on merge requests with new sidebar Fixes #3981 See merge request !2718
| * | | Fix diff and commit view on merge requestsbug/jschatz1/sidebar-issuesJacob Schatz2016-02-041-2/+4
| | | | | | | | | | | | | | | | | | | | with new sidebar Fixes #3981