summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'prefer-to_reference' into 'master' Douwe Maan2016-06-011-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `Snippet#to_reference` directly ## What does this MR do? Instead of hard coding snippet reference, we could just use the existing method for that. ## Why was this MR needed? To address https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4338#note_12166325 from @DouweM /cc @jschatz1 See merge request !4379
| * Use `Snippet#to_reference` directlyLin Jen-Shin2016-05-311-1/+1
| |
* | Merge branch 'rs-remember-me-2fa' into 'master' Douwe Maan2016-06-011-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass the "Remember me" value to the 2FA token form Prior, if a user had 2FA enabled and checked the "Remember me" field, the setting was ignored because the OTP input was on a new form and the value was never passed. Closes #18000 See merge request !4369
| * | Pass the "Remember me" value to the 2FA token formrs-remember-me-2faRobert Speicher2016-05-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Prior, if a user had 2FA enabled and checked the "Remember me" field, the setting was ignored because the OTP input was on a new form and the value was never passed. Closes #18000
* | | Merge branch 'rs-event-common-has-tooltip' into 'master' Dmitriy Zaporozhets2016-06-011-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tooltips for common Event feed entries This adds tooltips to the event target for events like "opened merge request !XYZ" After https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090#note_11712839, several references in the event feed had titles but were still missing tooltips. See merge request !4371
| * | | Add tooltips for common Event feed entriesrs-event-common-has-tooltipRobert Speicher2016-05-301-1/+1
| |/ / | | | | | | | | | | | | This adds tooltips to the event target for events like "opened merge request !XYZ"
* | | Upgrade Kaminari from 0.16.3 to 0.17.0.Connor Shea2016-05-317-9/+9
| | | | | | | | | | | | | | | | | | Changelog: https://github.com/amatsuda/kaminari/blob/master/CHANGELOG.rdoc#0170 Deprecates num_pages in favor of total_pages and includes Rails 5 support.
* | | Add Application Setting to configure Container Registry token expire delay ↵Kamil Trzcinski2016-05-311-0/+8
| |/ |/| | | | | (default 5min)
* | Small fixes and added to the changelogpatch/wiki_page_eventsGabriel Mazetto2016-05-301-1/+1
| |
* | Add Admin UI to enable Wiki Page events webhook in projectsGabriel Mazetto2016-05-302-1/+8
|/
* Use $ as the snippet prefix so it's consistentLin Jen-Shin2016-05-281-1/+1
|
* Merge branch 'fix-multiple-ci-status-poll' into 'master' Jacob Schatz2016-05-271-1/+7
|\ | | | | | | | | | | | | | | | | Fixed potential issue with 2 ci status polling events happening Possible cause for double notifications was if the request was slow & then you changed page whilst this request was happening it would finish on another page & then launch another interval - this stops that issue. Also passed in the CI status as an option value rather than waiting for the first ajax request to finish See merge request !3869
| * Fixed potential issue with 2 ci status polling events happeningfix-multiple-ci-status-pollPhil Hughes2016-05-261-1/+7
| |
* | Merge branch 'filter-by-any-user' into 'master' Jacob Schatz2016-05-261-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Filter issuables by any user ![any-user](/uploads/c9626b9ac355747344a7073f61dc0c82/any-user.gif) Closes #2836 See merge request !3820
| * | Filter issuables by any userPhil Hughes2016-05-261-1/+1
| |/ | | | | | | Closes #2836
* | Merge branch 'remove-unnecessary-titles' into 'master' Robert Speicher2016-05-2673-78/+4
|\ \ | | | | | | | | | | | | | | | | | | Remove header title from project pages With new navigation design it makes no sense to duplicate title in the header. See merge request !4304
| * | Return header title for new project pageremove-unnecessary-titlesDmitriy Zaporozhets2016-05-261-0/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove header title from project pagesDmitriy Zaporozhets2016-05-2673-78/+3
| | | | | | | | | | | | | | | | | | | | | With new navigation design it makes no sense to duplicate title in the header Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'commit-header-buttons' into 'master' Jacob Schatz2016-05-261-26/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduced number of buttons in commit header ## What does this MR do? Reduces the buttons in the commit header. ## What are the relevant issue numbers? Closes #17576 ## Screenshots ![Screen_Shot_2016-05-26_at_11.22.24](/uploads/b0d8535bbc02ae367f193dd6633bd022/Screen_Shot_2016-05-26_at_11.22.24.png) See merge request !4302
| * | | Improved mobile stylingcommit-header-buttonsPhil Hughes2016-05-261-14/+17
| | | |
| * | | Reduced number of buttons in commit headerPhil Hughes2016-05-261-14/+15
| | |/ | |/| | | | | | | Closes #17576
* | | Merge branch 'move-project-dropdown-async' into 'master' Jacob Schatz2016-05-261-3/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loads move issue dropdown async To keep the style of the dropdown the same as the other dropdowns in the issue form, it uses select2 rather than our new dropdowns. ![dropdown](/uploads/e80d5f48440b2a49fd3ac13e74c1ba55/dropdown.gif) Closes #16563 See merge request !4160
| * | | Correctly sends project IDPhil Hughes2016-05-201-1/+1
| | | |
| * | | Loads move issue dropdown asyncPhil Hughes2016-05-161-3/+1
| | | | | | | | | | | | | | | | Closes #16563
* | | | Merge branch 'services-ui' into 'master' Jacob Schatz2016-05-262-39/+45
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Updated services UI ![Screen_Shot_2016-05-17_at_10.38.10](/uploads/791ba27b3bbc18c9bde19ecf58ffea21/Screen_Shot_2016-05-17_at_10.38.10.png) See merge request !4177
| * | | Hide description on mobileservices-uiPhil Hughes2016-05-261-25/+24
| | | |
| * | | Updated services UIPhil Hughes2016-05-172-39/+46
| | | |
* | | | Merge branch 'remove-main-language' into 'master' Josh Frye2016-05-261-3/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove main_language and tests. Closes #14937 See merge request !4293
| * | | | Remove main_language and testsremove-main-languageJosh Frye2016-05-251-3/+0
| | | | |
* | | | | Merge branch 'link-to-in-issues-index' into 'master' Jacob Schatz2016-05-262-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace `link_to_gfm` with `link_to` in merge request and issue titles. ## What does this MR do? This removed GitLab Markdown Formatting from issue titles due to issues and confusion it caused as well as performance reasons. On the issue/MR page itself, the formatting is preserved. This only effects index pages. See: ![Screen_Shot_2016-05-24_at_3.31.17_PM](/uploads/8857ed7f3cc6a47ea41ca88134e5d17a/Screen_Shot_2016-05-24_at_3.31.17_PM.png) I think the trade-off here is worth it, otherwise we'd just be playing wack-a-mole. ## Are there points in the code the reviewer needs to double check? I don't think so. ## Why was this MR needed? Previously if an issue had an emoji for its name it would be unclickable. Similarly, links were rendered inline if the title was something like “Fixes a bug with https://google.com”. This confused a number of users, so it’s removed. This is also ever so slightly more performant :) ## What are the relevant issue numbers? This fixes #17614 and #17230. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-05-24_at_3.19.52_PM](/uploads/25313af3d3995a096b7bad7c5a26d071/Screen_Shot_2016-05-24_at_3.19.52_PM.png) After: ![Screen_Shot_2016-05-24_at_3.20.13_PM](/uploads/f14f09918001bcbac2cd939b016479b2/Screen_Shot_2016-05-24_at_3.20.13_PM.png) Before: ![Screen_Shot_2016-05-24_at_3.20.48_PM](/uploads/c183ae2c491650c328eb5768f6a55fd9/Screen_Shot_2016-05-24_at_3.20.48_PM.png) After: ![Screen_Shot_2016-05-24_at_3.20.42_PM](/uploads/d3431a691768bae2c5244b9b632061b9/Screen_Shot_2016-05-24_at_3.20.42_PM.png) cc: @rspeicher @jschatz1 See merge request !4284
| * | | | Replace `link_to_gfm` with `link_to` in merge request and issue titles.link-to-in-issues-indexConnor Shea2016-05-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously if an issue had an emoji for its name it would be unclickable. Similarly, links were rendered inline if the title was something like “Fixes a bug with https://google.com”. This confused some users, so it’s removed. On the issue/MR page itself, the formatting is preserved. This only effects index pages. This is also ever so slightly more performant :) This fixes #17614 and #17230.
* | | | | Merge branch 'updated-contrib-calendar' into 'master' Jacob Schatz2016-05-253-33/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | POC: Updated contrib calendar In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it? ![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png) cc. @jschatz1 See merge request !3944
| * | | | | Fixed issue with selected date not loading correctlyPhil Hughes2016-05-161-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | Added loading icon to selected date box
| * | | | | Group the contributing calendar by dayPhil Hughes2016-05-162-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | This aligns the boxes correctly with the day on the left side of the calendar
| * | | | | Updated contrib map away from cal heat mapPhil Hughes2016-05-161-2/+0
| | |_|_|/ | |/| | |
* | | | | Add fade out to sub navAnnabel Dunstone2016-05-254-4/+6
| | | | |
* | | | | Add fade to project nav; fix bug with controlsAnnabel Dunstone2016-05-251-95/+99
| | | | |
* | | | | Add fade out to left side of layout nav; remove dropdown nav helper; remove ↵Annabel Dunstone2016-05-253-3/+5
| | | | | | | | | | | | | | | | | | | | controls button from mobile
* | | | | Remove arrows from mobile scroll fade outAnnabel Dunstone2016-05-252-38/+40
| | | | |
* | | | | Start scrolling tabs designAnnabel Dunstone2016-05-251-1/+2
| | | | |
* | | | | New confirmation email :fire:Robert Speicher2016-05-252-0/+50
| | | | |
* | | | | Make the standard Devise confirmation email our new plaintext versionRobert Speicher2016-05-252-9/+9
| | | | |
* | | | | Merge branch 'rs-remove-issue_to_atom' into 'master' Douwe Maan2016-05-254-11/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `issue_to_atom` helper See merge request !4265
| * | | | | Remove `issue_to_atom` helperrs-remove-issue_to_atomRobert Speicher2016-05-234-11/+17
| | | | | |
* | | | | | Merge branch 'improve-pipeline-design' into 'master' Douwe Maan2016-05-257-45/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve design of Pipeline view ## What does this MR do? Improves current design of Pipelines view when there is multiple stages. This makes the statuses clickable and makes the view more compact. ## Screenshots (if relevant) ![Screen_Shot_2016-05-21_at_01.20.40](/uploads/dd031b7af7005c7a61f3165fefa8b7c9/Screen_Shot_2016-05-21_at_01.20.40.png) cc @DouweM @markpundsack @rspeicher @marin See merge request !4230
| * | | | | | Remove top block from builds pageimprove-pipeline-designAnnabel Dunstone2016-05-242-4/+0
| | | | | | |
| * | | | | | Remove icons from tables; remove timestamp from pipelines, remove info block ↵Annabel Dunstone2016-05-244-24/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | at top of pipelines
| * | | | | | Merge branch 'master' into improve-pipeline-designKamil Trzcinski2016-05-2318-266/+237
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Improve status renderingKamil Trzcinski2016-05-211-2/+2
| | | | | | |
| * | | | | | Improve design of Pipeline viewKamil Trzcinski2016-05-213-18/+20
| | | | | | |