summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* pipeline css changesminor-pipeline-graph-beautyfixesdimitrieh2016-12-212-26/+46
|
* Merge branch '25225-fix-inconsistent-merge-button-styles' into 'master' Alfredo Sumaran2016-12-212-44/+27
|\ | | | | | | | | | | | | Homogenize revert and cherry-pick button styles generated by commits_helper.rb Closes #25225 See merge request !8053
| * Set “Remove branch” button to default sizeAlfredo Sumaran2016-12-211-1/+1
| |
| * remove unused helper methodMike Greiling2016-12-211-14/+0
| |
| * reduce common code even further to satisfy rake flayMike Greiling2016-12-211-23/+25
| |
| * remove button class size alteration from revert and cherry pick linksMike Greiling2016-12-212-4/+4
| |
| * factor out common code to satisfy rake flayMike Greiling2016-12-211-18/+16
| |
| * homogenize revert and cherry-pick button styles generated by commits_helperMike Greiling2016-12-211-7/+4
| |
* | Merge branch '25681-network-graph-long-commit-msg' into 'master' Alfredo Sumaran2016-12-211-6/+12
|\ \ | |/ |/| | | | | | | | | Account for newlines in commit messages on network graph Closes #25681 and #21086 See merge request !8131
| * Respect newlines in commit messages on network graph25681-network-graph-long-commit-msgSam Rose2016-12-161-6/+12
| |
* | Merge branch 'remove-u2f-error-logging' into 'master' Alfredo Sumaran2016-12-216-5/+10
|\ \ | | | | | | | | | | | | Display error code for U2F errors See merge request !7305
| * | Display error code for U2F errors (!7305)winniehell2016-11-076-5/+10
| | |
* | | Merge branch '25835-alert-wrapper-creates-extra-margin' into 'master' Jacob Schatz2016-12-211-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply margin on alert banners only when there is one or more alerts ## What does this MR do? Fixes extra margin added to all pages by !8151 ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![screenshot](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f8804454e82a61246d10fa026605fbb3/Screen_Shot_2016-12-19_at_2.04.42_PM.png) ## 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 #25835 See merge request !8209
| * | | apply margin on alert banners only when there is one or more alertsMike Greiling2016-12-201-2/+4
| | | |
* | | | Merge branch 'fix/25843' into 'master' Sean McGivern2016-12-2013-27/+24
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename SlackNotificationService back to SlackService ## What does this MR do? See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8191#note_20310845 ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25843 /cc @yorickpeterse @stanhu @smcgivern @felipe_artur @ayufan See merge request !8208
| * | | Rename MattermostNotificationService back to MattermostServicefix/25843Douglas Barbosa Alexandre2016-12-207-8/+8
| | | |
| * | | Rename SlackNotificationService back to SlackServiceDouglas Barbosa Alexandre2016-12-2011-19/+16
| | | |
* | | | Merge branch '19703-direct-link-pipelines' into 'master' Grzegorz Bizon2016-12-2030-157/+684
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix stage and pipeline specs and rubocop offenses19703-direct-link-pipelinesGrzegorz Bizon2016-12-204-21/+31
| | | | |
| * | | | Add isolated view spec for pipeline stage partialGrzegorz Bizon2016-12-201-0/+21
| | | | |
| * | | | Move test for HTML stage endpoint to controller specsGrzegorz Bizon2016-12-203-33/+47
| | | | |
| * | | | Fix broken testFilipa Lacerda2016-12-201-1/+1
| | | | |
| * | | | Fix broken testFilipa Lacerda2016-12-204-16/+22
| | | | | | | | | | | | | | | | | | | | Changes after review
| * | | | Adds tests for the mini pipeline graphFilipa Lacerda2016-12-203-6/+50
| | | | |
| * | | | Remove console.logFilipa Lacerda2016-12-201-2/+0
| | | | |
| * | | | Adds tests for the MiniPipelineGraph classFilipa Lacerda2016-12-203-2/+63
| | | | |
| * | | | Always show dropdownKamil Trzcinski2016-12-201-19/+12
| | | | |
| * | | | Improve specsKamil Trzcinski2016-12-203-9/+18
| | | | |
| * | | | Add tests for stage API endpointKamil Trzcinski2016-12-206-3/+70
| | | | |
| * | | | Pipeline graph node was one pixel offFilipa Lacerda2016-12-191-2/+2
| | | | |
| * | | | Resolve conflictFilipa Lacerda2016-12-192-77/+10
| | | | | | | | | | | | | | | | | | | | Fix tooltips in dropdown
| * | | | Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-1977-568/+835
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (32 commits) Update CHANGELOG.md for 8.13.10 Update CHANGELOG.md for 8.14.5 Add Wiki import to BB importer Make CI badge hitboxes better match container Move admin broadcast messages spinach feature to rspec Move Admin Appearance spinach feature to rspec Fix MR issue to do with merge user Check if selected object is valid before passing to calback Fix for missing service when importing from EE to CE Fix tests because now we don't convert values Spaces for literal hash updated spec Keep the value type for YAML variables Test if expanded_environment_name could expand var Fix duplicated build token problem and added relevant spec Just implement it in the block Move admin labels spinach test to rspec Bring back "notification-dropdown" class for styling and use "js-notification-dropdown" for JavaScript Fix 500 error for invalid path when visiting blame page Add sentence casing, fix groups page buttons, fix dark gray variable ...
| * | | | | Adds loading to improve UXFilipa Lacerda2016-12-194-21/+53
| | | | | |
| * | | | | Makes API call when stage is clickedFilipa Lacerda2016-12-196-22/+95
| | | | | |
| * | | | | Use group name for css classesFilipa Lacerda2016-12-191-2/+2
| | | | | |
| * | | | | Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-19226-1156/+3522
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (175 commits) Fix typo Always use `fixture_file_upload` helper to upload files in tests. Add CHANGELOG Fix extra spacing in all rgba methods in status file Improve spacing and fixes manual status color Add `ci-manual` status CSS with darkest gray color Move admin application spinach test to rspec Move admin deploy keys spinach test to rspec Fix CI/CD statuses actions' CSS on pipeline graphs Fix rubocop failures Store mattermost_url in settings Improve Mattermost Session specs Ensure the session is destroyed Improve session tests Setup mattermost session Fix link from doc/development/performance.md to 'Performance Monitoring' Fix query in Projects::ProjectMembersController to fetch members Improve test for sort dropdown on members page Fix sort dropdown alignment Undo changes on members search button stylesheet ...
| * | | | | | Render stage dropdown in separate API call as HTMLKamil Trzcinski2016-12-193-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` Endpoint: /group/project/pipelines/id/stage.json?stage=name Call: stage_namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline, stage: stage.name) ```
| * | | | | | Changes after reviewFilipa Lacerda2016-12-172-11/+7
| | | | | | |
| * | | | | | Revert unwanted changes to the db/schema.rb fileFilipa Lacerda2016-12-161-6/+5
| | | | | | |
| * | | | | | Remove unused style for dropdown.Filipa Lacerda2016-12-161-25/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves animation
| * | | | | | Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-1694-274/+822
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (30 commits) Add GitLab host to 2FA QR and manual info Fix broken test Fix rubocop Fix specs in Ruby 2.1 Clearer comment as to why the procedure is needed Ensure issuable state changes only fire webhooks once Improve performance on RemoveDuplicatesFromRoutes migration Fix the AddNameIndexToNamespace migration to be reversible Use optimized query to fill the routes table when running PostgreSQL Don't use the Route model in migrations Added KaTeX license and procedure to build it for Gitlab [ci skip] UX Guide: add guidance on cursor usage Changes after review Add missing group policy spec Limit description container for mrs while viewing side by side diff Refactor Namespace#parents method Change SlackService to SlackNotificationsService Made Ci::Builds to have same ref as Ci::Pipeline in dev fixtures Mattermost Notifications Service Replace static fixture for abuse_reports_spec (!7644) ...
| * \ \ \ \ \ \ Merge branch 'master' into 19703-direct-link-pipelinesFilipa Lacerda2016-12-1672-337/+1198
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (51 commits) Fix spec/features/admin/admin_active_tab_spec.rb Fix eslint errors Don't open Asciidoc module twice Add `gitlab_rails['auto_migrate'] = false` to HA docs for Redis/PG [ci skip] Unify margin widths Add $CI_ENVIRONMENT_NAME and $CI_ENVIRONMENT_SLUG Add Okta authentication documentation Create environments when the build referencing them is created Add an environment slug Make the index on environment name and project id unique, fixing up any duplicates Rename `issue create` slash command to `issue new` Add changelog for !7850. Update Mattermost slash commands docs to explain how to create a newline and use <kbd> for user input. See HTML5 spec: https://www.w3.org/TR/html5/text-level-semantics.html#the-kbd-element Improve `issue create …` slash command with user input keys to create a newline in chat clients. Add explicit status test, feedback: Don't call anything on a block, use simple if Use described_class and update description Also use latest_status, feedback: Fixed bug with +1 not autocompleting added changelog entry ...
| * | | | | | | | CSS - Adds background color.Filipa Lacerda2016-12-155-77/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes unused CSS Fix scss linter errors Adds changelog entry Increase icons size. Adds transition animation Fix jumping icon. Reduce icon size Fix columns width Changes after review Fix transition
| * | | | | | | | CSS: dropdown on hoverFilipa Lacerda2016-12-153-5/+58
| | | | | | | | |
| * | | | | | | | Adds new partial for borderless mini graph iconsFilipa Lacerda2016-12-152-2/+8
| | | | | | | | |
| * | | | | | | | Add new borderless iconsFilipa Lacerda2016-12-159-0/+9
| | | | | | | | |
| * | | | | | | | Removes duplicate declarationFilipa Lacerda2016-12-151-3/+1
| | | | | | | | |
| * | | | | | | | style dropdownFilipa Lacerda2016-12-151-0/+4
| | | | | | | | |
| * | | | | | | | Dropdown li styleFilipa Lacerda2016-12-151-6/+5
| | | | | | | | |
| * | | | | | | | Dropdown with arrowFilipa Lacerda2016-12-152-118/+153
| | | | | | | | |