Fakultas Ilmu Komputer UI

Commit 7a80593e authored by RYAN PUTRA BUDIANTO's avatar RYAN PUTRA BUDIANTO
Browse files

Merge branch 'staging'

# Conflicts:
#	build.gradle
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/controller/AdminController.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/controller/BaseController.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/controller/BookPageController.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/controller/CartController.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/controller/CuratorController.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/controller/ForgotPasswordController.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/controller/PaymentController.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/controller/ProfileController.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/controller/RegisterController.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/controller/WishlistController.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/factory/BookOrderFactory.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/factory/OrderFactory.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/forms/CreateGenreForm.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/model/Articles.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/model/BookModel.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/model/Role.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/model/User.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/model/Wishlist.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/repository/BookOrderRepository.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/repository/CartRepository.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/repository/GenreRepository.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/repository/WishlistRepository.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/security/MvcConfig.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/security/RyanUserDetails.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/security/RyanUserDetailsService.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/security/SecurityConfig.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/service/AddressServiceImpl.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/service/ArticleService.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/service/ArticleServiceImpl.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/service/BookOrderServiceImpl.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/service/BookService.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/service/BookServiceImpl.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/service/CartServiceImpl.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/service/GenreService.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/service/GenreServiceImpl.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/service/PaymentServiceImpl.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/service/UserServiceImpl.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/service/WishlistService.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/service/WishlistServiceImpl.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/util/ImageConverter.java
#	src/main/java/id/ac/ui/cs/advprog/landiandfriends/util/Utility.java
#	src/main/resources/application.properties
#	src/main/resources/static/js/create-book.js
#	src/main/resources/static/js/edit-book.js
#	src/main/resources/static/js/styleart.css
#	src/main/resources/templates/address-create.html
#	src/main/resources/templates/address-update.html
#	src/main/resources/templates/admin-payment-list.html
#	src/main/resources/templates/article-create.html
#	src/main/resources/templates/articles.html
#	src/main/resources/templates/book-create.html
#	src/main/resources/templates/book-edit.html
#	src/main/resources/templates/book-list.html
#	src/main/resources/templates/book-page.html
#	src/main/resources/templates/curator-dashboard.html
#	src/main/resources/templates/home.html
#	src/main/resources/templates/my-address.html
#	src/main/resources/templates/payment-methods.html
#	src/main/resources/templates/profile-edit.html
#	src/main/resources/templates/profile.html
#	src/main/resources/templates/successBan.html
#	src/main/resources/templates/the-article.html
#	src/main/resources/templates/updateArticle.html
#	src/main/resources/templates/wishlist.html
#	src/test/java/id/ac/ui/cs/advprog/landiandfriends/controller/AdminControllerTest.java
#	src/test/java/id/ac/ui/cs/advprog/landiandfriends/controller/BaseControllerTest.java
#	src/test/java/id/ac/ui/cs/advprog/landiandfriends/controller/BookPageControllerTest.java
#	src/test/java/id/ac/ui/cs/advprog/landiandfriends/controller/CartControllerTest.java
#	src/test/java/id/ac/ui/cs/advprog/landiandfriends/controller/CuratorControllerTest.java
#	src/test/java/id/ac/ui/cs/advprog/landiandfriends/model/ArticlesTest.java
#	src/test/java/id/ac/ui/cs/advprog/landiandfriends/model/CartTest.java
#	src/test/java/id/ac/ui/cs/advprog/landiandfriends/service/ArticleServiceImplTest.java
#	src/test/java/id/ac/ui/cs/advprog/landiandfriends/service/BookOrderServiceTest.java
#	src/test/java/id/ac/ui/cs/advprog/landiandfriends/service/BookServiceTest.java
#	src/test/java/id/ac/ui/cs/advprog/landiandfriends/service/CartServiceTest.java
#	src/test/java/id/ac/ui/cs/advprog/landiandfriends/service/GenreServiceTest.java
#	src/test/java/id/ac/ui/cs/advprog/landiandfriends/service/PaymentServiceImplTest.java
#	src/test/java/id/ac/ui/cs/advprog/landiandfriends/service/UserServiceImplTest.java
parents df363ab2 65454c75
Pipeline #134372 failed with stages
in 4 minutes and 9 seconds