summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Update issuable status icons33926-update-issuable-iconsEric Eastwood2017-12-132-4/+4
| | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33926 Changed file icons already addressed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15367
* Merge branch 'remove-tabindexes-from-tag-form' into 'master'Annabel Dunstone Gray2017-12-121-3/+3
|\ | | | | | | | | removed tab indexes from tag form See merge request gitlab-org/gitlab-ce!15886
| * removed tab indexes from tag formMarcus Amargi2017-12-121-3/+3
| |
* | Merge branch ↵Robert Speicher2017-12-124-26/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenter' into 'master' Refactor member view by using presenter Closes #28004 See merge request gitlab-org/gitlab-ce!15715
| * | Present member collection at the controller leveltmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenterRémy Coutable2017-12-124-26/+29
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Refactor member view by using presenterTM Lee2017-12-111-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create MemberPresenter alongside with GroupMemberPresenter and ProjectMemberPresenter - Make Member model Presentable - Move action_member_permission from MembersHelper into the MemberPresenter - Added rspec using double, separate specs for GroupMemberPresenter and ProjectMemberPresenter Fixes #28004. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'winh-cleanup-dropdowns' into 'master'Annabel Dunstone Gray2017-12-124-8/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clean up new dropdown styles Closes #39142 and #39446 See merge request gitlab-org/gitlab-ce!13676
| * | | Make label delete option redwinh-cleanup-dropdownsWinnie Hellmann2017-12-081-1/+6
| | | |
| * | | Fix hover style for dropdowns on new branches/tags pageWinnie Hellmann2017-12-082-2/+2
| | | |
| * | | Remove btn class from template selectorsWinnie Hellmann2017-12-081-5/+5
| | | |
* | | | Merge branch 'remove-unnecessary-js-issuable-edit' into 'master'Filipa Lacerda2017-12-121-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary js-issuable-edit Closes #41042 See merge request gitlab-org/gitlab-ce!15883
| * | | | Remove unnecessary js-issuable-editremove-unnecessary-js-issuable-editClement Ho2017-12-121-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'sophie-h/gitlab-ce-patch-15' into 'master'pawel/update-prometheus_gem_to_highly_optimized_versionSean McGivern2017-12-121-10/+16
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Hide issues and MRs in labels list if disabled See merge request gitlab-org/gitlab-ce!15863
| * | | Hide issues and MRs in labels list if disabledsophie-h/gitlab-ce-patch-15Sophie Herold2017-12-111-10/+16
| | |/ | |/| | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'single-list-multiple-clusters' into 'master'Kamil Trzciński2017-12-122-24/+6
|\ \ \ | | | | | | | | | | | | | | | | Use Single list for multiple clusters See merge request gitlab-org/gitlab-ce!15848
| * | | Remove Add Cluster button in clusters/indexsingle-list-multiple-clustersMatija Čupić2017-12-111-2/+0
| | | |
| * | | Change copy on list headerChris Peressini2017-12-111-1/+1
| | | |
| * | | Remove tab navigation from clusters/indexMatija Čupić2017-12-112-24/+8
| |/ /
* | | Merge branch 'add-js-prefix-issuable-edit' into 'master'Filipa Lacerda2017-12-122-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add js prefix for issuable-edit Closes #40965 See merge request gitlab-org/gitlab-ce!15813
| * | | Add js prefix for issuable-editadd-js-prefix-issuable-editClement Ho2017-12-082-4/+4
| | | |
* | | | Merge branch 'dm-image-blob-diff-full-url' into 'master'Sean McGivern2017-12-123-12/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use app host instead of asset host when rendering image blob or diff Closes #41002 See merge request gitlab-org/gitlab-ce!15854
| * | | | Use app host instead of asset host when rendering image blob or diffdm-image-blob-diff-full-urlDouwe Maan2017-12-123-12/+13
| | |/ / | |/| |
* | | | Merge branch '39608-comment-on-image-discussions-tab-alignment' into 'master'Tim Zallmann2017-12-121-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix comment on image discussion icon alignment (update icons) Closes #39608 See merge request gitlab-org/gitlab-ce!15760
| * | | | Fix comment on image discussion icon alignment39608-comment-on-image-discussions-tab-alignmentEric Eastwood2017-12-081-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39608 Use SVG icons to avoid having to position things See https://gitlab.com/gitlab-org/gitlab-ce/issues/39608#note_50088917
* | | | Merge branch '35724-animate-sidebar' into 'master'Filipa Lacerda2017-12-114-4/+4
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Animate contextual sidebar; change class names for easier readability Closes #35724 See merge request gitlab-org/gitlab-ce!15797
| * | | Fix mobile stylesAnnabel Dunstone Gray2017-12-071-8/+7
| | | |
| * | | Animate contextual sidebar; change class names for easier readabilityAnnabel Dunstone Gray2017-12-075-11/+12
| | | |
* | | | Merge branch '38032-deploy-markers-should-be-more-verbose' into 'master'Mike Greiling2017-12-081-0/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Resolve "Deploy markers should be more verbose" Closes #38032 See merge request gitlab-org/gitlab-ce!15641
| * | | Changed the deploy markers on the prometheus dashboard to be more verboseJose Ivan Vargas2017-12-071-0/+2
| | | |
* | | | Resolve "No feedback when checking on checklist if potential spam was detected"Luke Bennett2017-12-082-14/+20
| |_|/ |/| |
* | | Move the circuitbreaker check out in a separate processbvl-circuitbreaker-processBob Van Landuyt2017-12-081-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving the check out of the general requests, makes sure we don't have any slowdown in the regular requests. To keep the process performing this checks small, the check is still performed inside a unicorn. But that is called from a process running on the same server. Because the checks are now done outside normal request, we can have a simpler failure strategy: The check is now performed in the background every `circuitbreaker_check_interval`. Failures are logged in redis. The failures are reset when the check succeeds. Per check we will try `circuitbreaker_access_retries` times within `circuitbreaker_storage_timeout` seconds. When the number of failures exceeds `circuitbreaker_failure_count_threshold`, we will block access to the storage. After `failure_reset_time` of no checks, we will clear the stored failures. This could happen when the process that performs the checks is not running.
* | | Merge branch '40754-fix-flash-usage-with-personal-access-token' into 'master'Grzegorz Bizon2017-12-081-4/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix new personal access token showing up in a flash message Closes #40754 See merge request gitlab-org/gitlab-ce!15707
| * | | Fix new personal access token showing up in a flash message40754-fix-flash-usage-with-personal-access-tokenEric Eastwood2017-12-071-4/+3
| | | |
* | | | Merge branch '40825-use-relative-path-urls' into 'master'Robert Speicher2017-12-076-6/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use relative _path helper URLs in the GitLab UI Closes #40825 See merge request gitlab-org/gitlab-ce!15738
| * | | | Use relative _path helper URLs in the GitLab UI40825-use-relative-path-urlsEric Eastwood2017-12-076-6/+13
| | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40825
* | | | | Merge branch ↵Jacob Schatz2017-12-071-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40555-replace-absolute-urls-with-related-branches-to-avoid-hostname' into 'master' Replace absolute URLs on related branches/MRs with relative url to avoid hostname Closes #40555 See merge request gitlab-org/gitlab-ce!15735
| * | | | Replace absolute URLs on related branches/MRs with relative url to avoid ↵40555-replace-absolute-urls-with-related-branches-to-avoid-hostnameEric Eastwood2017-12-041-2/+2
| | |/ / | |/| | | | | | | | | | hostname
* | | | Merge branch 'merge-request-lock-icon-size-fix' into 'master'Annabel Dunstone Gray2017-12-072-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed merge request locked icon size Closes #40876 See merge request gitlab-org/gitlab-ce!15767
| * | | | Fixed merge request locked icon sizemerge-request-lock-icon-size-fixPhil Hughes2017-12-062-2/+2
| | | | | | | | | | | | | | | | | | | | Closes #40876
* | | | | Merge branch ↵Kamil Trzciński2017-12-071-17/+6
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40761-remove-the-checkbox-for-starting-a-new-pipeline-in-auto-devops-settings' into 'master' Resolve "Remove the checkbox for starting a new pipeline in Auto DevOps settings" Closes #40761 See merge request gitlab-org/gitlab-ce!15714
| * | | | Remove Auto DevOps checkboxes - frontend40761-remove-the-checkbox-for-starting-a-new-pipeline-in-auto-devops-settingsbikebilly2017-12-041-17/+6
| | | | |
* | | | | Merge branch 'dm-commit-diff-discussions-in-mr-context' into 'master'Douwe Maan2017-12-0712-55/+106
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow commenting on individual commits inside an MR Closes #31847 See merge request gitlab-org/gitlab-ce!12148
| * | | | | adding view and feature specsmicael.bergeron2017-12-072-5/+5
| | | | | |
| * | | | | add support for the commit reference filtermicael.bergeron2017-12-071-4/+4
| | | | | |
| * | | | | tidying up the changesmicael.bergeron2017-12-071-6/+13
| | | | | |
| * | | | | add support for commit (in mr) to reference filtermicael.bergeron2017-12-071-1/+1
| | | | | |
| * | | | | corrects the url buildingmicael.bergeron2017-12-075-29/+21
| | | | | |
| * | | | | diff notes created in merge request on a commit have the right contextmicael.bergeron2017-12-072-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | add a spec for commit merge request diff notes
| * | | | | Allow commenting on individual commits inside an MRDouwe Maan2017-12-0712-45/+97
| | |_|_|/ | |/| | |
* | | | | Use Markdown styling for new project guidelinesMarkus Koller2017-12-071-1/+2
|/ / / /
View Lorry Controller Status