bida/bastodon
6
0
Fork 0
Code Issues 7 Pull requests Releases Wiki Activity

Merge pull request #6 from Gargron/master

Browse source 
Merge
This commit is contained in:
nicolas 2016-11-25 18:14:42 +01:00 committed by GitHub
commit 9f9680412f
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/stylesheets/forms.scss
View file

@ -48,11 +48,16 @@ code {
display: block;
}
input[type=checkbox] {
display: inline-block;
label.checkbox {
position: relative;
top: 3px;
margin-right: 8px;
padding-left: 25px;
}
input[type=checkbox] {
position: absolute;
left: 0;
top: 1px;
margin: 0;
}
}

2
app/controllers/api_controller.rb
View file

@ -48,7 +48,7 @@ class ApiController < ApplicationController
response.headers['X-RateLimit-Limit'] = match_data[:limit].to_s
response.headers['X-RateLimit-Remaining'] = (match_data[:limit] - match_data[:count]).to_s
response.headers['X-RateLimit-Reset'] = (now + (match_data[:period] - now.to_i % match_data[:period])).to_s
response.headers['X-RateLimit-Reset'] = (now + (match_data[:period] - now.to_i % match_data[:period])).iso8601(6)
end
def set_pagination_headers(next_path = nil, prev_path = nil)