aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* normalizes spacing in a CHANGELOG [ci skip]Xavier Noria2015-11-111-6/+6
* Merge branch 'fxn-master'Xavier Noria2015-11-1113-105/+581
|\
| * update docs for MessageEncryptor#new to recommend a KDF [ci skip]Paul Kehrer2015-11-111-2/+2
| * Add days_in_year methodJon Pascoe2015-11-113-3/+33
| * Fix week_field returning invalid valueChristoph2015-11-113-5/+16
| * Minor fix in Module#mattr_reader documentationYuri Kasperovich2015-11-111-1/+1
| * Clarify i18n active[model/record] key differencesJames Coleman2015-11-111-0/+2
| * fast and consistent return when local_cache does not existMichael Grosser2015-11-111-9/+12
| * modernizes the test definitions in the file monitors suiteXavier Noria2015-11-111-16/+17
| * applies code style guidelinesXavier Noria2015-11-115-14/+14
| * simplifies the implementation of #watching?Xavier Noria2015-11-111-16/+12
| * simplifies directories_to_watchXavier Noria2015-11-111-7/+4
| * registers these changes in the CHANGELOGsXavier Noria2015-11-112-0/+16
| * adds a comment about how does filter_out_descendants preserve orderXavier Noria2015-11-111-0/+1
| * rewrites bare loop as untilXavier Noria2015-11-111-3/+1
| * simplifies the implementation of existing parentXavier Noria2015-11-101-13/+2
| * indents private methods as per our guidelinesXavier Noria2015-11-101-28/+28
| * encapsulates the logic to choose the file monitor in app configXavier Noria2015-11-101-1/+9
| * renames the module with shared tests for file monitorsXavier Noria2015-11-103-5/+5
| * simplifies PathHelper with a Pathname refinementXavier Noria2015-11-101-22/+22
| * the evented monitor filters out descendantsXavier Noria2015-11-102-10/+66
| * better tmp file management in the monitors suiteXavier Noria2015-11-101-36/+88
| * adds another test case in the monitors suiteXavier Noria2015-11-101-1/+17
| * editorial pass over test method namesXavier Noria2015-11-091-5/+5
| * improves waiting in the file monitors suiteXavier Noria2015-11-093-23/+21
| * adds more tests for the file monitorsXavier Noria2015-11-091-0/+60
| * s/watcher/checker/gXavier Noria2015-11-081-3/+3
| * more ad-hoc sleepsXavier Noria2015-11-081-2/+4
| * create the tmpdir under testXavier Noria2015-11-081-1/+1
| * encapsulate sleep margin when touching filesXavier Noria2015-11-081-5/+6
| * renames the monitor creation helperXavier Noria2015-11-083-11/+11
| * refactors the file monitors test suiteXavier Noria2015-11-083-57/+47
| * let listen stop all listeners on teardownXavier Noria2015-11-081-0/+5
| * s/@modified/@updated/gXavier Noria2015-11-081-6/+6
| * stop ascending at the longest common subpathXavier Noria2015-11-082-33/+126
| * remove unused constants in the file monitor suitesXavier Noria2015-11-082-4/+0
| * upgrade listen to 3.0.4Xavier Noria2015-11-084-5/+5
| * document the evented file system monitor opt-in in the config guide [ci skip]Xavier Noria2015-11-081-0/+22
| * remove explicit File.expand_path callXavier Noria2015-11-081-1/+1
| * no need to have access to the listenerXavier Noria2015-11-081-4/+1
| * move the listen gem in the Gemfile to the development groupXavier Noria2015-11-081-3/+4
| * revises the implementation of the evented file monitorXavier Noria2015-11-081-24/+65
| * initial edit pass over the evented file checker patchXavier Noria2015-11-083-41/+67
| * implements an evented file update checker [Puneet Agarwal]Xavier Noria2015-11-089-104/+218
* | Merge pull request #22255 from reaperhulk/key-derivationRafael França2015-11-111-2/+2
|\ \
| * | update docs for MessageEncryptor#new to recommend a KDF [ci skip]Paul Kehrer2015-11-101-2/+2
|/ /
* | Merge pull request #22216 from grosser/grosser/fast-retRafael França2015-11-101-9/+12
|\ \
| * | fast and consistent return when local_cache does not existMichael Grosser2015-11-071-9/+12
* | | Merge pull request #22244 from pacso/time-days-in-yearAndrew White2015-11-103-0/+30
|\ \ \
| * | | Add days_in_year methodJon Pascoe2015-11-103-0/+30