Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

E1631. Refactor bidding interface #778

Closed
wants to merge 19 commits into from
Closed

E1631. Refactor bidding interface #778

wants to merge 19 commits into from

Conversation

lzheng5
Copy link

@lzheng5 lzheng5 commented Oct 28, 2016 •
edited

Somebody tried to refactor the sign_up_sheet_controller.rb in the master branch. They modified some code but not intelligent_topic_selection view. Our original change has already been merged into the master branch, it was working.

But if we tried to merge the code from master, the refactored code would fail. So we will wait for the refactoring to complete, and after that the build should automatically pass.

mghegde and others added 19 commits October 17, 2016 20:36
@mghegde
Added Sortable List for topic selection which updates priority in Bid…
3138286 
…s database
@mghegde
Fixed Bug: Update topic_id to the bids table. It was updating topic_n…
6b4d061 
…umber before
@lzheng5
ignore vendor and node
340e8eb
@lzheng5
Merge branch 'master' of https://github.com/expertiza/expertiza
a768328
@lzheng5
Merge branch 'master' of https://github.com/mghegde/expertiza
2d2b765
@lzheng5
Updated schema
1fefb11
@lzheng5
Updated intelligent topic selection interface
20df8cb
Add files via upload
7f6a496
Updated list.erb
114435c
@mghegde
Changes to set priority with intelligent topic selection
343b4ec
@mghegde
Merge branch 'master' of https://github.com/mghegde/expertiza
948c50c
@mghegde
Code cleanup - Removed redundant/commented lines
13a21e9
@mghegde
Code cleanup. Remove unnecessary code
7691c50
@lzheng5
Resolve conflicts
1efa702
@lzheng5
Fixed a syntax merge error
dbfcd33
@lzheng5
Updated Gemfile
660cabd
@lzheng5
Resolve conflict in sign_up_sheet_controller
53d1343
@lzheng5
Get rid of the lock file
6368315
@lzheng5
Updated Gemfile.lock
6afe3bf
@coveralls
Copy link

Coverage Status

Coverage remained the same at 42.54% when pulling 6afe3bf on mghegde:master into 4ee1f91 on expertiza:master.

@yangsong8
Copy link
Contributor

@theakbar has merged and modified.

@yangsong8 yangsong8 closed this Nov 21, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
CSC517 2016 Fall OSS Projects
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@lzheng5 @coveralls @yangsong8 @sandeepKatypally @Winbobob @mghegde