summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Fixed style issuessubscribe-button-fixPhil Hughes2016-04-141-1/+1
|
* Fixed haml style issuesPhil Hughes2016-04-141-1/+1
|
* Fixed issue with failing testsPhil Hughes2016-04-122-2/+2
|
* Removed references to subscribe-button CSS classPhil Hughes2016-04-122-3/+3
| | | | | | These were being blocked by adblocks Closes #15043
* Merge branch 'rs-form_errors' into 'master' Dmitriy Zaporozhets2016-04-1131-153/+41
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize the way we check for and display form errors - Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard. See merge request !3531
| * Standardize the way we check for and display form errorsrs-form_errorsRobert Speicher2016-04-0431-153/+41
| | | | | | | | | | | | | | | | | | | | | | | | - Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard.
* | Merge branch 'mr-ui-update' into 'master' Jacob Schatz2016-04-119-77/+79
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated UI for new merge request Closes #2540 ![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png) ![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png) See merge request !3228
| * | Addressed feedbackPhil Hughes2016-04-112-8/+11
| | | | | | | | | | | | Removed important from css
| * | Fixed buildsPhil Hughes2016-04-062-12/+5
| | |
| * | Fixed target project updatePhil Hughes2016-04-063-12/+8
| | |
| * | Checkmarks in dropdowns for already selected valuesPhil Hughes2016-04-061-7/+7
| | |
| * | Use new dropdowns for MR comparePhil Hughes2016-04-061-8/+47
| | |
| * | Updated UI for new merge requestPhil Hughes2016-04-066-55/+26
| | | | | | | | | | | | Closes #2540
* | | Merge branch 'prevent_users_from_upvoting_downvoting_emoji' into 'master' Jacob Schatz2016-04-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | prevent users from being able to both upvote and downvote See merge request !3495
| * | | prevent users from being able to both upvote and downvoteArinde Eniola2016-04-091-1/+1
| | | |
* | | | Merge branch 'rs-markdown-preview-tabindex' into 'master' Jacob Schatz2016-04-101-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove tab stop from "Write", "Preview", "Go full screen" links Closes #15089 See merge request !3635
| * | | | Remove tab stop from "Write", "Preview", "Go full screen" linksrs-markdown-preview-tabindexRobert Speicher2016-04-091-3/+3
| |/ / / | | | | | | | | | | | | Closes #15089
* | | | Merge branch 'redesign_labels_page' into 'master' Jacob Schatz2016-04-102-8/+12
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redesign labels page closes #14227 ## Desktop ![Screen_Shot_2016-04-05_at_7.19.37_PM](/uploads/a52b764565b6e2739fb6932178f8bde5/Screen_Shot_2016-04-05_at_7.19.37_PM.png) ## Mobile ![Screen_Shot_2016-04-04_at_6.40.57_PM](/uploads/9804b074126fcdb6755918e9f4c472a7/Screen_Shot_2016-04-04_at_6.40.57_PM.png) See merge request !3507
| * | | fix the failing tests and some changesArinde Eniola2016-04-061-4/+4
| | | |
| * | | finish up the design and add info to the changelogArinde Eniola2016-04-061-4/+4
| | | |
| * | | change the subscribe, delete and edit buttons to iconsArinde Eniola2016-04-062-8/+12
| | | |
* | | | Merge branch '14400-diff-redesign' into 'master' Jacob Schatz2016-04-095-18/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff redesign Fixes #14400 Fixes #13500 ![diffs_redesign](/uploads/16da9557e497114d886ef5ece2f306b3/diffs_redesign.gif) See merge request !3476
| * | | | Remove comment count & icon from side by side view14400-diff-redesignAnnabel Dunstone2016-04-071-6/+0
| | | | |
| * | | | Diff touch upsAnnabel Dunstone2016-04-071-1/+1
| | | | |
| * | | | Remove comment count & iconAnnabel Dunstone2016-04-071-3/+0
| | | | |
| * | | | Diff design updatesAnnabel Dunstone2016-04-071-5/+5
| | | | |
| * | | | Update diff colors and iconsAnnabel Dunstone2016-04-072-3/+3
| | | | |
* | | | | Merge branch 'efficient-emoji-loading' into 'master' Robert Speicher2016-04-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only load emoji spritesheet when necessary On a normal issue where the only award emoji displayed by default are the thumbs-up and thumbs-down emoji, this decreases the page load by 670KB or 250KB depending on pixel density. Resolves #14334. See merge request !3449
| * | | | | Add "sprite" parameter to emoji_icon helperconnorshea2016-04-081-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The emoji_icon helper used to display the award emoji in Issue and Merge Request views. By default the spritesheet is used, but passing `sprite: false` to the `emoji_icon` helper makes the emoji render as separate images. For award emoji displayed by default (e.g. thumbs-up, thumbs-down, and any that have been awarded to the issue/MR) the independent images are used. Only when the full emoji menu is opened does the full spritesheet load. On a normal issue this change decreases the page load by 670KB or 250KB depending on pixel density. Resolves #14334.
* | | | | Add a missing Oxford comma in some text on the Activity graph.connorshea2016-04-081-1/+1
|/ / / / | | | | | | | | | | | | Resolves #14668. [ci skip]
* | | | Revert "Merge branch 'new-navigation-prototype' into 'master'"Jacob Schatz2016-04-077-17/+47
| | | | | | | | | | | | This reverts merge request !3494
* | | | Merge branch 'fix-number-of-todos-sidebar-is-not-updated' into 'master' Jacob Schatz2016-04-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update number of Todos in the sidebar when it's marked as "Done" Closes #15002 See merge request !3600
| * | | | Update number of Todos in the sidebar when it's marked as "Done"Douglas Barbosa Alexandre2016-04-071-1/+1
| | | | |
* | | | | Merge branch 'issue_14012' into 'master' Rémy Coutable2016-04-071-0/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix problem when creating milestones in groups without projects Fixes #14012 See merge request !3481
| * | | | Improve codeFelipe Artur2016-04-051-0/+8
| | | | |
* | | | | Merge branch 'dont-assign-me-if-you-arent-allow' into 'master' Rémy Coutable2016-04-071-6/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide "assign to me" link if not allowed Fixes #14996 See merge request !3590
| * | | | | Remove duplication. Remove JS data attributesJacob Schatz2016-04-071-6/+6
| | | | | |
| * | | | | Hide "assign to me" link if not alloweddont-assign-me-if-you-arent-allowJacob Schatz2016-04-071-5/+7
| | | | | |
* | | | | | Merge branch 'feature/expose-builds-badge' into 'master' Rémy Coutable2016-04-072-1/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose badges This MR exposes badge somewhere in visible place. ![expose_badges](/uploads/d2e290d3013d1ef2b1bdeebbbe2c5d8b/expose_badges.png) Closes #13801 See merge request !3326
| * | | | | | Change name of badge variable in badges controllerGrzegorz Bizon2016-04-061-3/+3
| | | | | | |
| * | | | | | Remove obsolete badge code from project viewGrzegorz Bizon2016-04-061-3/+0
| | | | | | |
| * | | | | | Expose project badges in project settings menuGrzegorz Bizon2016-04-061-1/+6
| | | | | | |
| * | | | | | Make it possible to switch ref in badges viewGrzegorz Bizon2016-04-061-0/+2
| | | | | | |
| * | | | | | Add project header title in project badges viewGrzegorz Bizon2016-04-061-0/+2
| | | | | | |
| * | | | | | Use highlight helper to render badges code syntaxGrzegorz Bizon2016-04-061-4/+4
| | | | | | |
| * | | | | | Improve view with list of badgesGrzegorz Bizon2016-04-061-7/+12
| | | | | | |
| * | | | | | Extend build status badge, add html/markdown methodsGrzegorz Bizon2016-04-061-3/+3
| | | | | | |
| * | | | | | Add project badges view prototypeGrzegorz Bizon2016-04-062-0/+18
| | |_|_|/ / | |/| | | |
* | | | | | Reset MR optsanti-memoizer-mr-fixJacob Schatz2016-04-061-0/+2
| |/ / / / |/| | | |
* | | | | Merge branch 'patch/fix-markdown-preview-wikis' into 'master' Robert Speicher2016-04-071-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wiki preview URL converting problem [via Markdown] Current implementation when rendering the preview, thinks relative links are for project repository files. We are creating a new preview route that will define correct context data to render for wikis instead. Fixes #2380, #1184 See merge request !3461
View Lorry Controller Status