summaryrefslogtreecommitdiff
path: root/app/assets
Commit message (Collapse)AuthorAgeFilesLines
* New style for close buttons17756-close-btnAnnabel Dunstone2016-05-312-2/+18
|
* Merge branch 'bendyorke-comment-fix' into 'master' Jacob Schatz2016-05-271-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update notes immediately after closing/reopening ## What does this MR do? Fixes MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4127 Thanks @bendyorke! ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? Constant conflicts in that MR ## What are the relevant issue numbers? ## Screenshots (if relevant) Fixes #15091 See merge request !4323
| * Update notes immediately after closing/reopeningBen Yorke2016-05-271-4/+4
| |
* | Fixed issue with calendar activity button not sending request correctlyPhil Hughes2016-05-271-1/+1
|/
* Merge branch 'fix-multiple-ci-status-poll' into 'master' Jacob Schatz2016-05-271-1/+9
|\ | | | | | | | | | | | | | | | | 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/+9
| |
* | Merge branch 'filter-by-any-user' into 'master' Jacob Schatz2016-05-261-5/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Filter issuables by any user ![any-user](/uploads/c9626b9ac355747344a7073f61dc0c82/any-user.gif) Closes #2836 See merge request !3820
| * | Fixed user select failing tests on merge requestfilter-by-any-userPhil Hughes2016-05-261-1/+1
| | |
| * | Filter issuables by any userPhil Hughes2016-05-261-5/+7
| | | | | | | | | | | | Closes #2836
* | | Fix bug where fade div covers up controls buttonscroll-links-bugAnnabel Dunstone2016-05-261-0/+21
| | |
* | | Merge branch 'commit-header-buttons' into 'master' Jacob Schatz2016-05-262-5/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+20
| | | |
| * | | Reduced number of buttons in commit headerPhil Hughes2016-05-262-5/+1
| |/ / | | | | | | | | | Closes #17576
* | | Merge branch 'move-project-dropdown-async' into 'master' Jacob Schatz2016-05-261-0/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Loads move issue dropdown asyncPhil Hughes2016-05-161-0/+17
| | | | | | | | | | | | | | | | Closes #16563
* | | | Merge branch 'discussion-outdated-form' into 'master' Jacob Schatz2016-05-261-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed JS error when trying to remove discussion form ## What does this MR do? Fixes a JS error which was caused by an ID of the form not matching what was returned by the JSON. Instead of checking that, it gets the current form from the ajax success event. This would only happen on outdated discussions because the ID of the discussion form ends with `-false` because it isn't active. However, the note is added to an active discussion so the ID returned actually ends in `-true` & therefore the JS couldn't find the correct form. ## What are the relevant issue numbers? Closes #17778 See merge request !4303
| * | | Fixed JS error when trying to remove discussion formPhil Hughes2016-05-261-1/+1
| | |/ | |/| | | | | | | Closes #17778
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵sidebar-expand-collapseFatih Acet2016-05-2613-117/+462
|\ \ \ | |/ / | | | | | | sidebar-expand-collapse
| * | Merge branch 'updated-contrib-calendar' into 'master' Jacob Schatz2016-05-255-89/+219
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Moved into class methodsupdated-contrib-calendarPhil Hughes2016-05-161-90/+105
| | | |
| | * | Updated spacing of the calendarPhil Hughes2016-05-161-0/+3
| | | |
| | * | Fixed issue with selected date not loading correctlyPhil Hughes2016-05-162-34/+26
| | | | | | | | | | | | | | | | Added loading icon to selected date box
| | * | Formats tooltip title & date correctlyPhil Hughes2016-05-161-11/+25
| | | | | | | | | | | | | | | | Correctly changes the activity when clicking a date - will also revert back to old data when clicking date again
| | * | Group the contributing calendar by dayPhil Hughes2016-05-165-105/+119
| | | | | | | | | | | | | | | | 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-162-22/+114
| | |/
| * | Change to xs breakpoint, layout_nav updatesAnnabel Dunstone2016-05-252-11/+11
| | |
| * | Add fade out to sub navAnnabel Dunstone2016-05-252-18/+40
| | |
| * | Add fade to project nav; fix bug with controlsAnnabel Dunstone2016-05-251-8/+14
| | |
| * | Refactor nav links cssAnnabel Dunstone2016-05-251-15/+8
| | |
| * | Add fade out to left side of layout nav; remove dropdown nav helper; remove ↵Annabel Dunstone2016-05-252-37/+33
| | | | | | | | | | | | controls button from mobile
| * | Fix coffeescript; remove fade out div so area is clickable; remove scrollbar ↵Annabel Dunstone2016-05-252-2/+6
| | | | | | | | | | | | on chrome
| * | Move fade out divAnnabel Dunstone2016-05-251-2/+2
| | |
| * | Check screen width before increasing max positionAnnabel Dunstone2016-05-251-4/+2
| | |
| * | Remove arrows from mobile scroll fade outAnnabel Dunstone2016-05-253-30/+30
| | |
| * | Start scrolling tabs designAnnabel Dunstone2016-05-252-0/+48
| | |
| * | New confirmation email :fire:Robert Speicher2016-05-253-0/+134
| | |
| * | Merge branch 'improve-pipeline-design' into 'master' Douwe Maan2016-05-253-10/+24
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 icons from tables; remove timestamp from pipelines, remove info block ↵Annabel Dunstone2016-05-243-8/+2
| | | | | | | | | | | | | | | | at top of pipelines
| | * | Increase max-width of stage cellsAnnabel Dunstone2016-05-241-1/+1
| | | |
| | * | Merge branch 'master' into improve-pipeline-designKamil Trzcinski2016-05-2314-71/+202
| | |\ \
| | * | | Improve design of Pipeline viewKamil Trzcinski2016-05-211-3/+23
| | | | |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2016-05-2521-140/+283
|\ \ \ \ \ | |/ / / / | | | | | | | | | | sidebar-expand-collapse
| * | | | Merge branch 'closed-by-alignment' into 'master' Jacob Schatz2016-05-251-5/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related merge request text alignment Fixed the alignment of the text 'When this merge request is accepted...' on issues page ![Screen_Shot_2016-05-23_at_14.59.48](/uploads/5d2f4be94108364a9d004169a6825a9e/Screen_Shot_2016-05-23_at_14.59.48.png) See merge request !4251
| | * | | | Related merge request text alignmentclosed-by-alignmentPhil Hughes2016-05-231-5/+0
| | | | | |
| * | | | | Merge branch 'issue-filter-name-options' into 'master' Jacob Schatz2016-05-256-53/+52
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issuable filtering improvements This improves the filtering of issues and merge requests by creating a single file that encapsulates all the filtering. Previously this was done with a file for issues and a file for merge requests. Created the ability for the text search to be done alongside other filterables. Previously because this was outside the filterable form, this wasn't possible and would instead do either filter dropdown or text filter - not both. Fixes #4252 Fixed issue with not being able to filter and sort issues without refreshing the page. Fixes #15269 See merge request !3699
| | * | | | | Updated Ruby based on feedbackissue-filter-name-optionsPhil Hughes2016-05-241-2/+2
| | | | | | |
| | * | | | | Fixed up JS commentsPhil Hughes2016-05-202-5/+4
| | | | | | |
| | * | | | | Fixed issue with not being able to search text & filterPhil Hughes2016-05-161-1/+10
| | | | | | |
| | * | | | | Fixed failing rubocop testsPhil Hughes2016-05-162-40/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with issuable checkboxs not being init'd
| | * | | | | Added issue_search parameterPhil Hughes2016-05-161-1/+1
| | | | | | |