summaryrefslogtreecommitdiff
path: root/app/views/shared/icons
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'use-avatars-in-activity-view' into 'master' Douwe Maan2017-04-121-0/+0
|\ | | | | | | | | Use avatars instead of icons in activity view See merge request !10596
| * Add helper for using avatars vs iconsAnnabel Dunstone Gray2017-04-111-0/+0
| |
* | Update merged iconchange-merged-iconAnnabel Dunstone Gray2017-04-111-1/+1
|/
* Fix icon name error24784-mr-system-notesAnnabel Dunstone Gray2017-04-061-0/+0
|
* Change edit iconAnnabel Dunstone Gray2017-04-061-0/+1
|
* Leave icon area blank if legacy note; remove diamond iconAnnabel Dunstone Gray2017-04-061-1/+0
|
* Fix positioning of note iconsAnnabel Dunstone Gray2017-04-061-0/+0
|
* Fix newline errorsAnnabel Dunstone Gray2017-04-064-3/+3
|
* Add remaining system note iconsAnnabel Dunstone Gray2017-04-0614-6/+12
|
* Add system notes icon helper; add iconsAnnabel Dunstone Gray2017-04-066-0/+6
|
* Merge branch '29128-profile-page-icons' into 'master' Filipa Lacerda2017-04-066-3/+6
|\ | | | | | | | | | | | | Resolve "Add system note icons to profile page" Closes #29128 See merge request !10387
| * Update commit icon; fix specs29128-profile-page-iconsAnnabel Dunstone Gray2017-04-031-3/+1
| |
| * Start adding profile iconsAnnabel Dunstone Gray2017-04-035-0/+5
| |
* | Award emoji button smiley animationDimitrie Hoekstra2017-04-063-0/+3
| |
* | Delete unused icons; add empty lines to svg filesremove-unused-iconsAnnabel Dunstone Gray2017-04-0317-133/+7
|/
* Add shortcuts and counters to MRs and issues in navbarAnnabel Dunstone Gray2017-03-291-0/+1
|
* Delegate a single discussion to a new issueBob Van Landuyt2017-03-131-0/+1
| | | | | | Delegate a discussion in a merge request into a new issue. The discussion wil be marked as resolved and a system note will be added linking to the newly created issue.
* Added discussion comments avatars to diffPhil Hughes2017-03-081-0/+1
|
* Merge branch 'master' into zj-create-mattermost-teamZ.J. van de Weg2017-03-021-0/+1
|\
| * Removed disabled rules from the user_callout_spec.jsJose Ivan Vargas2017-02-231-1/+1
| | | | | | | | | | | | | | Also changed the cookie sets to true and false values to make it consistent with the rest of the javascript. Fixed some haml and a missing new line
| * Created unit tests, fixtures and integration testsJose Ivan Vargas2017-02-231-0/+1
| | | | | | | | | | Also changed the user_callout haml to a partial and added the corresponding SVG icon
* | Add newline at end of icon fileFilipa Lacerda2017-02-161-1/+1
| |
* | Adds Mattermost label and icon to new group formFilipa Lacerda2017-02-161-0/+1
|/
* Remove unneeded 'borderless' from icons nameFilipa Lacerda2017-01-254-0/+0
|
* added icons and fixed mini pipeline action dropdown iconsdimitrieh2017-01-254-0/+4
|
* Backport timetracking frontend to CE.Bryce Johnson2017-01-151-0/+1
|
* Merge branch '19620-auto-scroll-log' into 'master' Alfredo Sumaran2016-12-214-0/+12
|\ | | | | | | | | | | | | Improve Build Log scrolling experience Closes #19620 See merge request !7895
| * Renamed with `.svg`19620-auto-scroll-logKushal Pandya2016-12-214-0/+0
| |
| * Embed SVG using `custom_icon`Kushal Pandya2016-12-214-0/+12
| |
* | Merge branch 'zj-mattermost-slash-config' into 'master' Kamil Trzciński2016-12-211-0/+1
|\ \ | |/ |/| | | | | | | | | Mattermost slash auto config Closes #24769 See merge request !8070
| * Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-configKamil Trzcinski2016-12-202-0/+2
| |\
| * \ Merge branch 'mattermost-configure-frontend' into 'zj-mattermost-slash-config' Zeger-Jan van de Weg2016-12-191-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mattermost configuration frontend ## What does this MR do? Adds mattermost configuration frontend. ## Are there points in the code the reviewer needs to double check? :warning: NOTE: :warning: We can review @zj's MR (!8070) and this one asynchronously, we should wait for @zj's MR to complete it's backend review before we merge this branch into his. We would like @zj to do the merge. ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24769 See merge request !8079
| | * | Started on new slash commands edit viewmattermost-configure-frontendLuke "Jared" Bennett2016-12-171-0/+1
| | | |
| | * | Update manual build icon SVGGrzegorz Bizon2016-12-131-1/+1
| | | |
| | * | Adds manual action icon and case to show itFilipa Lacerda2016-12-131-0/+1
| | | |
* | | | Merge branch '19703-direct-link-pipelines' into 'master' Grzegorz Bizon2016-12-209-0/+9
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Direct link from pipeline list to builds" ## What does this MR do? - Adds a dropdown with builds in the mini pipeline graph in the pipelines table - Unnest a lot of CSS related with pipelines in order to make it reusable ## Screenshots ![Screen_Shot_2016-12-15_at_14.45.41](/uploads/ca1c61842a422a34383e029d668034b7/Screen_Shot_2016-12-15_at_14.45.41.png) ![Screen_Shot_2016-12-15_at_14.45.49](/uploads/952e3277143639ce4ad111103034faeb/Screen_Shot_2016-12-15_at_14.45.49.png) ![Screen_Shot_2016-12-15_at_14.46.02](/uploads/f7369a124b1c3c0db4194de2cb637ef0/Screen_Shot_2016-12-15_at_14.46.02.png) ![graph_animation](/uploads/9bae036cb5acff499f992a4722943d72/graph_animation.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25071 Closes #19703 See merge request !8097
| * | | Add new borderless iconsFilipa Lacerda2016-12-159-0/+9
| |/ /
* | | Merge branch '22348-gitea-importer' into 'master' Rémy Coutable2016-12-201-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It adds a brand new importer for Gitea! This is a continuation of !6945 started by @bkc. Gitea aims to be 100% GitHub-compatible but there's a few differences: - Gitea is not an OAuth provider (yet): https://github.com/go-gitea/gitea/issues/27 - This means we cannot map Gitea users given an assignee ID => assignees are not set on imported issues and merge requests - No releases API for now: https://github.com/go-gitea/gitea/issues/330 - API version is `v1` (GitHub is `v3`) - The IID field for milestones is `id` compared to `number` in GitHub. - Issues, PRs, milestones, labels don't have a `url` field (the importer now fallback to `''` in that case) **Known issues:** - Comments are not imported because comments JSON always have a blank `html_url`/`issue_url`/`pull_request_url`, so the IID cannot be extracted and the issuable cannot be found... :( This is tracked in https://github.com/go-gitea/gitea/issues/401, and solved by https://github.com/gogits/gogs/pull/3624 but this needs to be submitted / merged in Gitea. This is noted in the documentation. ## Are there points in the code the reviewer needs to double check? 1. I've made `Import::GiteaController` inherit from `Import::GithubController` since both controllers should be identical in the long-term and their current differences are small. 1. I've added a base `IssuableFormatter` class from which `IssueFormatter` & `PullRequestFormatter` inherit 1. I've added shared examples for GitHub/Gitea importer classes 1. I've made `Gitlab::ImportSources` more robust and tested! :christmas_tree: 1. I've added routing specs for import routes! :christmas_tree: Closes #22348 See merge request !8116
| * | | Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-191-0/+1
| |/ / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Add terminal UI and controller actionsFatih Acet2016-12-191-0/+1
|/ /
* | Replace old icons with new onesFilipa Lacerda2016-12-1317-16/+8
| |
* | Renders new icons for the pipeline graphFilipa Lacerda2016-12-089-0/+0
| |
* | Adds new icons for pipeline graphFilipa Lacerda2016-12-079-0/+9
|/ | | | | | Fix padding Fix hover state of icon
* Merge branch 'ci-style-tweaks-8.14' into 'master' Annabel Dunstone Gray2016-11-228-38/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Last minute CI Style tweaks for 8.14 ## What does this MR do? - Skipped builds now have use a lighter gray. - Converted all status icons to be managed by scss colors only - Consolidated all status icon styles into icons.scss - Deleted any classes or styles within the svg's - Gave status badges a hover style, but only if clickable - Fixed alignment issue mini-pipeline graph ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? As per the discussion in the slack chat https://gitlab.slack.com/archives/ci/p1479743986004879 ## Screenshots (if relevant) - skipped builds: ![image](/uploads/f59c615045472b9b13940463a64c8038/image.png) ![image](/uploads/26503d1da9c93b3c22c5c0c1369feceb/image.png) - hover style status badges: ![2016-11-22_00.21.27](/uploads/36afa7aa64d60e1755bf39d97f90c59f/2016-11-22_00.21.27.gif)![2016-11-22_00.58.38](/uploads/1d95fa5db124412d3f83b3e79b9b71ec/2016-11-22_00.58.38.gif) - mini pipeline graph: before: ![image](/uploads/38e5e57ada3907b17c6e24e1446b4514/image.png) after: ![image](/uploads/de4476693a1397eebfc680661159daf7/image.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7643
| * Converted all status icons to be managed by scss colors only and deleted any ↵Dimitrie Hoekstra2016-11-228-38/+8
| | | | | | | | classes or styles within the svg's, plus gave status badges a hover style only if clickable
* | Add view to handle the case when user doesn’t have access to stageAlfredo Sumaran2016-11-211-0/+25
| |
* | Add overview view for Cycle AnalyticsAlfredo Sumaran2016-11-211-0/+81
| |
* | Remove delta column and use stage data from responseAlfredo Sumaran2016-11-211-3/+0
| |
* | Show friendly message when stage has no dataAlfredo Sumaran2016-11-211-0/+27
| |
* | Cycle analytics second iterationAlfredo Sumaran2016-11-212-0/+6
|/ | | | | | - Vue app has been completely rewritten - New components - Basic CSS