summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
...
| * | remove public field from namespace and refactoringnamespace-clean_upValery Sizov2016-01-041-1/+1
| | |
| * | catch Emoji encode errorValery Sizov2016-01-041-1/+1
| | |
| * | Downcased user or email search for avatar_icon.issue_3780Stefan Kahlhöfer2015-12-281-1/+1
| | | | | | | | | | | | Signed-off-by: Rubén Dávila <rdavila84@gmail.com>
* | | More refactoring from last code review. #3945Rubén Dávila2016-01-141-2/+2
| | | | | | | | | | | | | | | | | | * Use commit objects instead of IDs when generating diffs * Use proper references when generating MR's source and target * Update broken specs
* | | Remove duplication around highlighting.Douwe Maan2016-01-141-15/+1
| | |
* | | Refactor parallel_diff generation a bit.Douwe Maan2016-01-142-32/+65
| | |
* | | Little refactor for usage of html_safe. #3945Rubén Dávila2016-01-131-4/+5
| | |
* | | Fix broken spec. #3945Rubén Dávila2016-01-121-1/+2
| | |
* | | Small fixes from code review. #3945Rubén Dávila2016-01-121-3/+3
| | |
* | | Make diff_line_content helper return a safe String. #3945Rubén Dávila2016-01-121-2/+2
| | |
* | | Change strategy to highlight diffs. #3945Rubén Dávila2016-01-071-2/+2
| | | | | | | | | | | | | | | Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content.
* | | Fix broken spec and small refactor. #3945Rubén Dávila2015-12-301-2/+2
| | |
* | | New implementation for highlighting diff files. #3945Rubén Dávila2015-12-303-24/+3
| | | | | | | | | | | | | | | | | | * It is more performant given now we process all the diff file instead of processing line by line. * Multiline comments are highlighted correctly.
* | | Add syntax highlighting to diff view. #3945Rubén Dávila2015-12-282-4/+31
|/ /
* | Merge branch 'close-open-ajax-issue' into 'master' Robert Speicher2015-12-251-0/+4
|\ \ | | | | | | | | | | | | | | | | | | open and close issue via ajax request. With tests Close and Reopen issues with ajax request. See merge request !2164
| * \ resolves conflicts with new buttonsJacob Schatz2015-12-233-18/+25
| |\ \
| * | | open and close issue via ajax request. With testsJacob Schatz2015-12-211-0/+4
| | | |
* | | | Merge branch 'revert_votes_back' into 'master' Dmitriy Zaporozhets2015-12-251-0/+12
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert vote buttons back to issue and MR pages https://gitlab.com/gitlab-org/gitlab-ce/issues/3672 /cc @dzaporozhets @JobV ![joxi_screenshot_1450809309400](/uploads/379a75505e0d5f24e743aa0a6a6684e2/joxi_screenshot_1450809309400.png) See merge request !2206
| * | | add sorting of awardsValery Sizov2015-12-251-0/+12
| | | |
* | | | Merge branch 'rs-opengraph' into 'master' Douwe Maan2015-12-251-0/+74
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Add Open Graph meta tags See merge request !2192
| * | | Add support for `twitter:label` meta tagsrs-opengraphRobert Speicher2015-12-241-0/+24
| | | |
| * | | Truncate page_description to 30 wordsRobert Speicher2015-12-241-2/+2
| | | |
| * | | Account for `@project.description` being nilRobert Speicher2015-12-231-1/+1
| | | |
| * | | Add page descriptions and imagesRobert Speicher2015-12-231-0/+50
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | A limited number of pages have defined their own descriptions, but otherwise we default to the Project's description (if `@project` is set), or the old `brand_title` fallback. The image will either be the uploaded project icon (never a generated one), the user's uploaded icon or Gravatar, or, finally, the GitLab logo.
* | | Grace period support for TFAGabriel Mazetto2015-12-241-0/+12
| | |
* | | Merge branch 'edit-on-fork' into 'master' Dmitriy Zaporozhets2015-12-242-30/+113
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Automatically fork a project when not allowed to edit a file. Fixes #3215. To do: - [ ] Add tests ----- ## "Edit" button on file in a project the user does NOT have write access to ![edit_file](/uploads/7602157420768aef483a6586bba2d164/edit_file.png) ## Clicking will automatically create a fork ![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png) ## When the fork has been created, the user is returned to the edit page on the original project with a notice ![edit_notice](/uploads/94ed1319404370ff1e9c0d672fb41e03/edit_notice.png) ## The user cannot change the target branch and is informed that editing will start an MR ![edit_footer](/uploads/4da68d4795c7177e575b7c434d16eeae/edit_footer.png) ## Hitting "Commit changes" will commit and start an MR from my fork to the origin project ![Screen_Shot_2015-12-17_at_23.38.08](/uploads/d777a4db6f38a5a1be84031694465bc1/Screen_Shot_2015-12-17_at_23.38.08.png) ----- ## "Create file, "Upload file" and "New directory" buttons in a project the user does NOT have write access to ![new_directory](/uploads/72f556248f30d6652523bbb4be01b3e0/new_directory.png) ## Clicking any of these options will automatically create a fork ![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png) ## When the fork has been created, the user is returned to the tree page on the original project with a notice ![new_directory_notice](/uploads/a1a3e11308ae0e8f0913fae6813a37ed/new_directory_notice.png) ## Clicking "New directory" again will show the modal. The user cannot change the target branch and is informed that editing will start an MR ![new_dir](/uploads/99ca8cbfb2f70603e352b3fdf67b6281/new_dir.png) ## Hitting "Create directory" will commit and start an MR from my fork to the origin project ![Screen_Shot_2015-12-17_at_23.39.19](/uploads/3713d0235abf831361b803a6198c5bc1/Screen_Shot_2015-12-17_at_23.39.19.png) cc @dzaporozhets @skyruler See merge request !2145
| * | | Fix specs and behavior for LFS filesDouwe Maan2015-12-181-6/+4
| | | |
| * | | Satisfy RubocopDouwe Maan2015-12-181-2/+2
| | | |
| * | | Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-182-29/+114
| | |/ | |/|
* | | Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master' Douwe Maan2015-12-241-2/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix/visibility level setting in forked projects Fixes #3136 /cc @DouweM See merge request !1744
| * \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-12-2130-247/+324
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (723 commits) Bump Rack Attack to v4.3.1 for security fix Remove duplicate entry in the changelog Remove extra spaces after branchname Fix merge-request-reopen button title Add branch and tag operation to tree dropdown Use gitlab-shell 2.6.9 Clarify Windows shell executor artifact upload support Fix feature specs: we always show the build status if ci_commit is present Do not display project group/name when issue and MR are in same project Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled Use gitlab-workhorse 0.5.1 Fix ci_projects migration by using the value only from latest row [ci skip] Revert sidebar position for issue and merge request Add info on using private Docker registries in CI [ci skip] Upgrade Poltergeist to 1.8.1. #4131 Fix ux issue with "This issue will be closed automatically" message Move MR Builds tab next to Commits Api support for requesting starred projects for user Fix Rubocop complain. Fix merge widget JS for buttons ... Conflicts: app/models/project.rb
| * | | Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-2011-113/+117
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (296 commits) fox tests Don't rescue Exception, but StandardError adressing comments Update gitlab-shell documentation [ci skip] Align hash literals in IssuesFinder spec Fix tests Fix 'Attach a file' link in new tag form Add link to git-lfs client [ci skip] Do not limit workhorse POST/PUT size in NGINX added specs added spinach tests Since GitLab CI is enabled by default, remove enabling it by pushing .gitlab-ci.yml Fix tests Commits without .gitlab-ci.yml are marked as skipped Changelog entry for finding issues performance Use a JOIN in IssuableFinder#by_project Memoize IssuableFinder#projects Removed trailing whitespace from IssuableFinder Added benchmark for IssuesFinder Updated DB schema with new issues/projects indexes ... Conflicts: app/models/project.rb
| * \ \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-064-34/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Add CI permissions and api links to README [ci skip] Remove duplicate documentation links make migrations reversible Add missing stage to builds view CI details cleanup Allow groups to appear in the search results if the group owner allows it Update installation.md update example of regex for pytest-cov
| * \ \ \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-041-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (23 commits) Use single spaces Improvements to profile page UI Replace all usages of `git` command with configurable binary path Update Shell Commands doc for configurable git binary path Minor reformatting for Facebook integration doc Use proper labels for OAuth providers Add Facebook authentication Bump stamp to ~> 0.6.0 Add extra padding between user description and links on profile page Fix tests Fix clipboard button overflow Apply new design for user profile page Improve profile page UI Better name for up-level links Fixed User sorting specs Only sort by IDs by default Added benchmark for User.all Add changelog entry for contacted_at Spread out runner contacted_at updates Only redirect to homepage url when its not the root url ...
| * | | | | | Move visibility_level check for forked projects to Project modelTomasz Maczukin2015-11-031-2/+1
| | | | | | |
* | | | | | | Emoji picker: better alias handlingValery Sizov2015-12-241-1/+2
| |_|_|_|_|/ |/| | | | |
* | | | | | fix specsValery Sizov2015-12-221-2/+4
| | | | | |
* | | | | | base implementation of emoji picker [ci skip]Valery Sizov2015-12-221-9/+5
| | | | | |
* | | | | | Merge branch 'fix_leave_project_display' into 'master' Stan Hu2015-12-221-8/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix and test leave project display The 'Leave this project' display on project page was broken. It was calling the method incorrectly, which returned `nil` and displayed nothing. This fixes the display and also adds 2 different tests for it. cc/ @jvanbaarsen @stanhu Please review and merge if you think it looks good. Thank you! See merge request !2166
| * | | | | | Fix and test leave project displayDrew Blessing2015-12-211-8/+8
| | |_|_|_|/ | |/| | | |
* | | | | | ci_build_details_path should return nil if builds_page result is nilKamil Trzcinski2015-12-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is required since we parse URI later and remove the credentials
* | | | | | removes api credentials from link to build_pageMarvin Frick2015-12-221-1/+8
|/ / / / / | | | | | | | | | | | | | | | | | | | | Also adds a spec for MergeRequestHelper to avoid having a regression later on.
* | | | | Merge remote-tracking branch 'origin/rs-simplify-status-icon'Dmitriy Zaporozhets2015-12-161-18/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Define CI status icon colors in SCSS instead of a helperrs-simplify-status-iconRobert Speicher2015-12-121-18/+4
| | | | | |
* | | | | | Rename .issuable-details to .detail-page (and -header and -description)Douwe Maan2015-12-161-5/+5
| | | | | |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-161-2/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'rs-clipboard-fixes' into 'master' Douwe Maan2015-12-161-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clipboard buttons on MR instructions and Commit#show See merge request !2108
| | * | | | | | Fix clipboard buttons on MR instructions and Commit#showrs-clipboard-fixesRobert Speicher2015-12-151-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-161-2/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'rs-timeago' into 'master' Douwe Maan2015-12-161-2/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix time_ago_with_tooltip for activity feed Closes #4002 See merge request !2074