summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'close-open-ajax-issue' into 'master' Robert Speicher2015-12-251-9/+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-2323-123/+148
| |\
| * | changes `data-url` to `href` for javascript url grabbingJacob Schatz2015-12-211-2/+2
| | |
| * | open and close issue via ajax request. With testsJacob Schatz2015-12-211-9/+4
| | |
* | | Merge branch 'revert_votes_back' into 'master' Dmitriy Zaporozhets2015-12-251-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | |
* | | | Merge branch 'rs-opengraph' into 'master' Douwe Maan2015-12-255-8/+33
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Add Open Graph meta tags See merge request !2192
| * | | Add link to twitter docsDouwe Maan2015-12-251-1/+2
| | | |
| * | | Add more twitter metatags.Douwe Maan2015-12-251-0/+6
| | | |
| * | | Add og:site_nameDouwe Maan2015-12-251-2/+2
| | | |
| * | | Add support for `twitter:label` meta tagsrs-opengraphRobert Speicher2015-12-243-4/+7
| | | |
| * | | Use `request.fullpath` for `og:url` tagRobert Speicher2015-12-241-1/+1
| | | |
| * | | Add page descriptions and imagesRobert Speicher2015-12-235-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Add Open Graph meta tagsRobert Speicher2015-12-231-1/+5
| | |/ | |/|
* | | Add to application_settings forced TFA optionsGabriel Mazetto2015-12-241-0/+12
| | |
* | | Grace period support for TFAGabriel Mazetto2015-12-241-0/+1
| | |
* | | Enable "Add key" button when user fills in a proper keyStan Hu2015-12-241-1/+1
| | | | | | | | | | | | Closes #4295
* | | Merge branch 'fix-explore-ui' into 'master' Dmitriy Zaporozhets2015-12-243-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix explore projects page UI # Before ![Screenshot_2015-12-24_14.13.03](/uploads/fdae7648acc8b8076709e4bfc867a5f8/Screenshot_2015-12-24_14.13.03.png) # After ![Screenshot_2015-12-24_14.11.29](/uploads/b1ecd3bebfadab9d2ceabaae27046271/Screenshot_2015-12-24_14.11.29.png) cc @jschatz1 @skyruler Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2202
| * | | Fix explore projects page UIfix-explore-uiDmitriy Zaporozhets2015-12-243-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'new-project-header-redesign' into 'master' Dmitriy Zaporozhets2015-12-244-17/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropdowns for clone. Star and Fork with new count areas. Star and Unstarred Works now Fixes #2876 and #3482 Used existing styles. <br/> Did not attempt to make pixel perfect as styles already exist. <br/> ![Screen_Shot_2015-12-18_at_5.24.56_PM](/uploads/a79ba1e0be0232f2aeef8a43f3253479/Screen_Shot_2015-12-18_at_5.24.56_PM.png) See merge request !2156
| * | | | Moves star code to a classJacob Schatz2015-12-232-35/+3
| | | | |
| * | | | fixes failing test by updating project clone instructionsJacob Schatz2015-12-231-4/+4
| | | | |
| * | | | Merge branch 'master' into new-project-header-redesignJacob Schatz2015-12-238-31/+30
| |\ \ \ \
| * | | | | refactoring javascript to put starring functionality in a functionJacob Schatz2015-12-231-19/+24
| | | | | |
| * | | | | spacing changed from 4 to 2 in ` _clone_panel.html.haml`.Jacob Schatz2015-12-231-21/+21
| | | | | |
| * | | | | spinach tests will pass nowJacob Schatz2015-12-231-1/+1
| | | | | |
| * | | | | dropdown chooses right defaultJacob Schatz2015-12-231-4/+5
| | | | | |
| * | | | | adds dropdown for cloningJacob Schatz2015-12-232-13/+40
| | | | | |
| * | | | | adds starring and unstarring text to star button, also adds partial new stylesJacob Schatz2015-12-231-2/+17
| | | | | |
| * | | | | arrows for buttonsJacob Schatz2015-12-233-1/+12
| | | | | |
* | | | | | Merge remote-tracking branch 'origin/master' into emoji-picker-searchemoji-picker-searchValery Sizov2015-12-2414-65/+126
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'edit-on-fork' into 'master' Dmitriy Zaporozhets2015-12-2413-59/+122
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ \ \ Merge branch 'master' into edit-on-forkDouwe Maan2015-12-182-47/+52
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/tree/_tree_header.html.haml
| | * | | | | | Fix specs and behavior for LFS filesDouwe Maan2015-12-182-3/+3
| | | | | | | |
| | * | | | | | Satisfy RubocopDouwe Maan2015-12-182-2/+2
| | | | | | | |
| | * | | | | | Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-1812-47/+113
| | | | | | | |
| * | | | | | | Merge branch 'branch-invalid-name' into 'master' Douwe Maan2015-12-241-6/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add JS validation for invalid characters in branch name Fixes #3293 Demo: ![out-1080p](/uploads/ba21c359b6b8b440c40cacf772ec0df7/out-1080p.gif) See merge request !2122
| | * \ \ \ \ \ \ Merge branch 'master' into branch-invalid-nameDouglas Barbosa Alexandre2015-12-189-112/+117
| | |\ \ \ \ \ \ \
| | * | | | | | | | Add JS validation for invalid characters in branch nameDouglas Barbosa Alexandre2015-12-171-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More info about valid ref names: https://www.kernel.org/pub/software/scm/git/docs/git-check-ref-format.ht ml
| | * | | | | | | | Remove the hint on the branch name inputDouglas Barbosa Alexandre2015-12-161-1/+0
| | | | | | | | | |
| | * | | | | | | | Add more descriptive error message when create branch with invalid nameDouglas Barbosa Alexandre2015-12-161-0/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'emoji-picker-fix' into 'master' Valery Sizov2015-12-241-2/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emoji picker: better alias handling related to https://gitlab.com/gitlab-org/gitlab-ce/issues/3576 See merge request !2198
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into emoji-picker-searchValery Sizov2015-12-249-32/+31
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'fix-error-500-global-search-issues' into 'master' Dmitriy Zaporozhets2015-12-231-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when doing a search in dashboard before visiting any project If a search turned up an issue, under certain conditions you would see this error: ``` ActionView::Template::Error (undefined method `path_with_namespace' for nil:NilClass): 6: - if issue.description.present? 7: .description.term 8: = preserve do 9: = search_md_sanitize(markdown(issue.description)) 10: %span.light 11: #{issue.project.name_with_namespace} 12: - if issue.closed? lib/gitlab/markdown/upload_link_filter.rb:36:in `build_url' lib/gitlab/markdown/upload_link_filter.rb:31:in `process_link_attr' lib/gitlab/markdown/upload_link_filter.rb:18:in `block in call' lib/gitlab/markdown/upload_link_filter.rb:17:in `call' lib/gitlab/markdown.rb:127:in `gfm' lib/gitlab/markdown.rb:24:in `render' app/helpers/gitlab_markdown_helper.rb:61:in `markdown' app/views/search/results/_issue.html.haml:9:in `block in _app_views_search_results__issue_html_haml__4127460390996300432_59973760' app/views/search/results/_issue.html.haml:8:in `_app_views_search_results__issue_html_haml__4127460390996300432_59973760' app/views/search/_results.html.haml:20:in `_app_views_search__results_html_haml__589475855773452465_61761440' app/views/search/show.html.haml:5:in `_app_views_search_show_html_haml___1852335078065998536_69780120' ``` Confirmed this is issue still happens in GitLab 8.4, and it also happens on GitLab.com. Here's how to reproduce: 1. Login in a new browser. 2. Enter a search term on the top right that will land a hit in the "Issues" (e.g. GitLab). 3. Click on "Issues" tab. You should get an Error 500. The issue is that @project isn't assigned to anything. See merge request !2110
| | * | | | | | | | Fix Error 500 when doing a search in dashboard before visiting any projectStan Hu2015-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a search turned up an issue, under certain conditions you would see this error: ``` ActionView::Template::Error (undefined method `path_with_namespace' for nil:NilClass): 6: - if issue.description.present? 7: .description.term 8: = preserve do 9: = search_md_sanitize(markdown(issue.description)) 10: %span.light 11: #{issue.project.name_with_namespace} 12: - if issue.closed? lib/gitlab/markdown/upload_link_filter.rb:36:in `build_url' lib/gitlab/markdown/upload_link_filter.rb:31:in `process_link_attr' lib/gitlab/markdown/upload_link_filter.rb:18:in `block in call' lib/gitlab/markdown/upload_link_filter.rb:17:in `call' lib/gitlab/markdown.rb:127:in `gfm' lib/gitlab/markdown.rb:24:in `render' app/helpers/gitlab_markdown_helper.rb:61:in `markdown' app/views/search/results/_issue.html.haml:9:in `block in _app_views_search_results__issue_html_haml__4127460390996300432_59973760' app/views/search/results/_issue.html.haml:8:in `_app_views_search_results__issue_html_haml__4127460390996300432_59973760' app/views/search/_results.html.haml:20:in `_app_views_search__results_html_haml__589475855773452465_61761440' app/views/search/show.html.haml:5:in `_app_views_search_show_html_haml___1852335078065998536_69780120' ```
| * | | | | | | | | Merge branch 'new-project-button-seperate-from-filter-name' into 'master' Dmitriy Zaporozhets2015-12-232-18/+17
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New project button with filter in header. Fixes #3943 ![Screen_Shot_2015-12-21_at_3.47.01_PM](/uploads/f7f952440b4bb4b55f62241bbc328c95/Screen_Shot_2015-12-21_at_3.47.01_PM.png) See merge request !2165
| | * | | | | | | | | adds css for `left-top-menu`. Also hides buttons in certain for factors.Jacob Schatz2015-12-231-2/+2
| | | | | | | | | | |
| | * | | | | | | | | project headerJacob Schatz2015-12-232-18/+17
| | | | | | | | | | |
| * | | | | | | | | | new button sizesAndriy Dyadyura2015-12-235-12/+12
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'new-buttons' into 'master' Dmitriy Zaporozhets2015-12-231-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New buttons OLD ![Screenshot_2015-12-22_21.42.59](/uploads/79e85727586f7b917b8ab9ef867e79dc/Screenshot_2015-12-22_21.42.59.png) NEW ![Screenshot_2015-12-22_21.42.21](/uploads/aee54160f17e0502e14ca5c754dcfe50/Screenshot_2015-12-22_21.42.21.png) See merge request !2179