Commit edcdbee8d0a0439a10bdfb64a8287ff5e8330e25
1 parent
8ff84101
Exists in
staging
and in
4 other branches
removing merge conflit
Showing
2 changed files
with
0 additions
and
14 deletions
Show diff stats
app/views/tasks/index.html.erb
| ... | ... | @@ -35,9 +35,6 @@ |
| 35 | 35 | </p> |
| 36 | 36 | <% end %> |
| 37 | 37 | <p> |
| 38 | - <%= labelled_select(_('Assigned to')+': ', :filter_responsible, :id, :name, @filter_responsible, [OpenStruct.new(:name => _('All'), :id => nil), OpenStruct.new(:name => _('Unassigned'), :id => -1)] + @responsible_candidates) %> | |
| 39 | - </p> | |
| 40 | - <p> | |
| 41 | 38 | <%= submit_button(:search, _('Search')) %> |
| 42 | 39 | </p> |
| 43 | 40 | <% end %> | ... | ... |
db/migrate/20150223180807_add_private_token_info_to_users.rb
| ... | ... | @@ -1,11 +0,0 @@ |
| 1 | -class AddPrivateTokenInfoToUsers < ActiveRecord::Migration | |
| 2 | - def self.up | |
| 3 | - add_column :users, :private_token, :string | |
| 4 | - add_column :users, :private_token_generated_at, :datetime | |
| 5 | - end | |
| 6 | - | |
| 7 | - def self.down | |
| 8 | - remove_column :users, :private_token | |
| 9 | - remove_column :users, :private_token_generated_at | |
| 10 | - end | |
| 11 | -end |