summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Align Segoe UI label text26059-segoe-ui-verticalAnnabel Dunstone Gray2017-02-072-2/+2
|
* Merge branch '21518_recaptcha_spam_issues' into 'master'Sean McGivern2017-02-074-1/+24
|\ | | | | | | | | | | | | Use reCaptcha when an issue identified as spam Closes #21518 See merge request !8846
| * Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-074-1/+24
| |
* | Merge branch ↵Kamil Trzciński2017-02-078-35/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | '26165-combine-runners-and-variables-and-triggers-and-ci-cd-pipelines-settings-pages' into 'master' Merge Triggers, Runners, Variables and Pipelines to a single option called "CI/CD Pipelines" Closes #26165 See merge request !8430
| * | Changed the controller/route name to 'ci/cd' and renamed the corresponding filesJose Ivan Vargas2017-02-062-2/+2
| | | | | | | | | | | | Added tests to verify the access policy to the new controller
| * | Corrected titles on the triggers and pipelines sectionsJose Ivan Vargas2017-02-063-3/+3
| | |
| * | Removed options from the gear button in the projects and consolidated into oneJose Ivan Vargas2017-02-061-14/+2
| | | | | | | | | | | | Added test for the CiCdPipelinesController
| * | changed pipelines controller name to ci_cd_pipelinesJose Ivan Vargas2017-02-062-1/+1
| | |
| * | Converted the views to partials that compose the menu item "pipelines"Jose Ivan Vargas2017-02-066-18/+16
| | |
* | | Merge branch 'ee-1439-read-only-user' into 'master' Douwe Maan2017-02-073-23/+39
|\ \ \ | | | | | | | | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!998 See merge request !8984
| * | | More backportDouwe Maan2017-02-061-4/+13
| | | |
| * | | Backport of the frontend view, including testsJose Ivan Vargas2017-02-061-6/+12
| | | |
| * | | Backport UI changes from gitlab-org/gitlab-ee!998Timothy Andrew2017-02-062-22/+23
| | | |
| * | | Backport changes from gitlab-org/gitlab-ee!998Timothy Andrew2017-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Some changes in EE for the auditor user feature need to be backported to CE to avoid merge conflicts. This commit encapsulates all these backports.
* | | | Merge branch 'fe-commit-mr-pipelines' into 'master' Fatih Acet2017-02-066-44/+51
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Use vue.js Pipelines table in commit and merge request view Closes #27141 See merge request !8844
| * | | Use webpack to require filesFilipa Lacerda2017-02-052-3/+2
| | | | | | | | | | | | | | | | Changes after review
| * | | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-0425-36/+37
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (76 commits) fix failing test fix Vue warnings for missing element [ci skip] UX Guide: Button placement in groups Change window size before visiting page, to get correct scroll position Fix slash commands spec error Move project services to new location under Integrations Move webhooks to new a location under Integrations Fixed redirection from http://someproject.git to http://someproject consistently use single quotes allow application.js to require other scripts which start with application* DRY with Gitlab.config.webpack.dev_server references disable webpack proxy in rspec environment due to conflicts with webmock gem remove changes to Procfile configure webpack dev server port via environment variable add rack middleware to proxy webpack dev server remove dev-server config from development environment Document that the retro and kickoff notes are public add CHAGELOG.md entry for webpack branch fix failing rspec build fix test failure for merge request widget ...
| * | | Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-0317-43/+42
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (65 commits) Fixed eslint test failure Fixed adding to list bug Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index Fixed modal lists dropdown not updating when list is deleted Fixed remove btn error after creating new issue in list Removed duplicated test Removed Masonry, instead uses groups of data Uses mixins for repeated functions Fixed up specs Props use objects with required & type values Removes labels instead of closing issue when clicking remove button Fixed JS lint errors Fixed issue card spec Added webkit CSS properties Fixed bug with empty state showing after search Fixed users href path being incorrect Fixed bug where 2 un-selected issues would stay on selected tab Fixed DB schema Changed how components are added in objects Added remove button Add optional id property to the issue schema Fixed issue link href ...
| * \ \ \ Resolve conflict after mergeFilipa Lacerda2017-02-0339-86/+86
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into fe-commit-mr-pipelinesFilipa Lacerda2017-02-035-12/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Backport changes from EE squash replace `find_with_namespace` with `find_by_full_path` PlantUML support for Markdown Update api docs and minor changes Force new password after password reset via API Fixed protected branches dropdown Fixed up tests Fixed the active branch selected indicator Changed how the data is returned - we only care about the branch/tag name Uses take rather than Kaminari Use cloneNode instead of createElement Improved ref switcher dropdown performance
| * | | | | | Only load pipelines vue component when there are pipelines.Filipa Lacerda2017-02-032-26/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Empty state to vue component
| * | | | | | Add time ago auto-update to the 2 newest tablesFilipa Lacerda2017-02-031-1/+2
| | | | | | |
| * | | | | | Fix syntax error in the new merge request viewGrzegorz Bizon2017-02-031-1/+1
| | | | | | |
| * | | | | | Moves pagination to shared folderFilipa Lacerda2017-02-032-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document and remove unused code Declare components in a consistent way; Use " instead of ' to improve consistency; Update documentation; Fix commit author verification to match the use cases; Adds tests for the added components Fix paths in pagination spec Adds tests to pipelines table used in merge requests and commits Use same resource interceptor Fix eslint error
| * | | | | | Use new vue js pipelines table to render in merge request viewFilipa Lacerda2017-02-035-31/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate data-toggle attributes. Reuse the same pipeline table Remove unneeded required resources Remove unused file; Fix mr pipelines loading Updates documentation
| * | | | | | Transform vue_pipelines index into a non-dependent table component.Filipa Lacerda2017-02-031-3/+3
| | | | | | |
| * | | | | | Use same folder structure in spec for vue shared resourcesFilipa Lacerda2017-02-031-1/+1
| | | | | | |
| * | | | | | First iterationFilipa Lacerda2017-02-032-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create shared folder for vue common files Update paths Second iteration - refactor main component to be 100% reusable between the 3 tables
* | | | | | | Merge branch 'issues-modal-filters' into 'master' Fatih Acet2017-02-061-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue filters in boards modal Closes #26205 See merge request !8903
| * \ \ \ \ \ \ Merge branch 'master' into issues-modal-filtersPhil Hughes2017-02-0626-39/+48
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Passes through the correct endpointsPhil Hughes2017-02-031-0/+2
| | | | | | | |
| * | | | | | | Hardcoded author, assignee & milestone dropdownsPhil Hughes2017-02-031-1/+2
| | | | | | | |
* | | | | | | | Merge branch 'jej-pages-to-ce' into 'master' Douwe Maan2017-02-0613-0/+170
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding GitLab Pages to CE Closes #14605, gitlab-com/infrastructure#1058, gitlab-ee#1333, and #323 See merge request !8463
| * \ \ \ \ \ \ \ Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-0640-84/+91
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * \ \ \ \ \ \ \ \ Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-0356-115/+137
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | If no pages were deployed, show nothing. Feedback:Lin Jen-Shin2017-01-311-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/628#note_14000640
| * | | | | | | | | | Only show the message if user is not the ownerLin Jen-Shin2017-01-311-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #323
| * | | | | | | | | | Fix adding pages domain to projects in groupsKamil Trzcinski2017-01-311-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Introduce pages_deployed? to Project modelKamil Trzcinski2017-01-313-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Fix pages abilitiesKamil Trzcinski2017-01-314-8/+11
| | | | | | | | | | |
| * | | | | | | | | | Updated according to commentsKamil Trzcinski2017-01-314-9/+8
| | | | | | | | | | |
| * | | | | | | | | | Added information about the CNAME recordKamil Trzcinski2017-01-311-0/+8
| | | | | | | | | | |
| * | | | | | | | | | Split PagesController into PagesController and PagesDomainsControllerKamil Trzcinski2017-01-317-50/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. PagesController is used to show all domains and general overview of Pages 2. PagesDomainsController is used to manage pages domains
| * | | | | | | | | | Added spinach testsKamil Trzcinski2017-01-313-9/+8
| | | | | | | | | | |
| * | | | | | | | | | Add tests for Active TabKamil Trzcinski2017-01-311-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Pages domain model specsKamil Trzcinski2017-01-311-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Fix viewsKamil Trzcinski2017-01-312-19/+20
| | | | | | | | | | |
| * | | | | | | | | | Fix the remove_pagesKamil Trzcinski2017-01-311-3/+4
| | | | | | | | | | |
| * | | | | | | | | | Implement extra domains and save pages configurationKamil Trzcinski2017-01-3110-123/+111
| | | | | | | | | | |
| * | | | | | | | | | Implement proper verification of certificate's public_key against the ↵Kamil Trzcinski2017-01-312-51/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | private_key
View Lorry Controller Status