[obs-commits] [openSUSE/open-build-service] 25aa2c: [webui] Move jquery.expander.js file to vendor ass...
Branch: refs/heads/master Home: https://github.com/openSUSE/open-build-service Commit: 25aa2c2068f34081ff2223590b665ebfa281c11c https://github.com/openSUSE/open-build-service/commit/25aa2c2068f34081ff2223... Author: Björn Geuken <bgeuken@suse.de> Date: 2016-03-30 (Wed, 30 Mar 2016) Changed paths: M src/api/app/assets/javascripts/webui/application.js R src/api/app/assets/javascripts/webui/application/jquery.expander.js A src/api/vendor/assets/javascripts/jquery.expander.js Log Message: ----------- [webui] Move jquery.expander.js file to vendor assets directory Conflicts: src/api/app/assets/javascripts/webui/application.js Commit: ff93ab5d6525acdcac962020650493058dd00362 https://github.com/openSUSE/open-build-service/commit/ff93ab5d6525acdcac9620... Author: Björn Geuken <bgeuken@suse.de> Date: 2016-03-30 (Wed, 30 Mar 2016) Changed paths: M src/api/app/helpers/webui/webui_helper.rb M src/api/app/views/webui/request/show.html.erb M src/api/spec/helpers/webui/webui_helper_spec.rb M src/api/test/functional/webui/maintenance_workflow_test.rb M src/api/test/functional/webui/package_create_test.rb M src/api/test/functional/webui/package_edit_test.rb M src/api/test/functional/webui/patchinfo_controller_test.rb M src/api/test/functional/webui/project_controller_test.rb M src/api/test/functional/webui/project_edit_test.rb M src/api/test/functional/webui/request_controller_test.rb Log Message: ----------- [webui] Fix description expanding on request page The html id of the js expander handler was not matching the actual element id, which broke the expander feature for requests. This patch fixes it and also renames the id from 'description_text' to 'description-text' to match most common html naming conventions. Commit: 9cf4892df1663d7f714e55399f1457dd20cd93ed https://github.com/openSUSE/open-build-service/commit/9cf4892df1663d7f714e55... Author: Björn Geuken <bgeuken@suse.de> Date: 2016-03-30 (Wed, 30 Mar 2016) Changed paths: M src/api/app/assets/javascripts/webui/application.js R src/api/vendor/assets/javascripts/jquery.expander.js A src/api/vendor/assets/javascripts/jquery.expander.min.js Log Message: ----------- [webui] Update expander js * Update plugin to most current version * Use minified expander version Commit: a47d0a648bed6941d4975a9229cddf04a6b35fe3 https://github.com/openSUSE/open-build-service/commit/a47d0a648bed6941d4975a... Author: Björn Geuken <bgeuken@suse.de> Date: 2016-03-30 (Wed, 30 Mar 2016) Changed paths: M src/api/app/models/bs_request.rb M src/api/app/models/user.rb A src/api/spec/factories/bs_request_actions.rb A src/api/spec/factories/bs_requests.rb A src/api/spec/features/webui/requests_spec.rb Log Message: ----------- [webui] Add a test for expandable views Add tests for request show page to prevent regressions like the one fixed in e8f0bea416bd2467a093ef603ea01b3b0376a70e. Commit: bb99444147bff26a4bceeeab81cb30d375939c6b https://github.com/openSUSE/open-build-service/commit/bb99444147bff26a4bceee... Author: Björn Geuken <bgeuken@suse.de> Date: 2016-03-31 (Thu, 31 Mar 2016) Changed paths: M src/api/app/assets/javascripts/webui/application.js R src/api/app/assets/javascripts/webui/application/jquery.expander.js M src/api/app/helpers/webui/webui_helper.rb M src/api/app/models/bs_request.rb M src/api/app/models/user.rb M src/api/app/views/webui/request/show.html.erb A src/api/spec/factories/bs_request_actions.rb A src/api/spec/factories/bs_requests.rb A src/api/spec/features/webui/requests_spec.rb M src/api/spec/helpers/webui/webui_helper_spec.rb M src/api/test/functional/webui/maintenance_workflow_test.rb M src/api/test/functional/webui/package_create_test.rb M src/api/test/functional/webui/package_edit_test.rb M src/api/test/functional/webui/patchinfo_controller_test.rb M src/api/test/functional/webui/project_controller_test.rb M src/api/test/functional/webui/project_edit_test.rb M src/api/test/functional/webui/request_controller_test.rb A src/api/vendor/assets/javascripts/jquery.expander.min.js Log Message: ----------- Merge pull request #1661 from bgeuken/expander Update expander js and fix expandable view Compare: https://github.com/openSUSE/open-build-service/compare/947580ced9d1...bb9944...
participants (1)
-
Björn Geuken