prepare merge
commit2210e94727e03cbc0f1e08c1ea9834abb9d1e4e7
authorJulian K. Arni <jkarni@gmail.com>
dateMon 20 Apr 2015, 11:18 (11 years ago)
parent6a11656
.gitignoredeleted−17
@@ -1,17 +0,0 @@
1−dist
2−cabal-dev
3−*.o
4−*.hi
5−*.chi
6−*.chs.h
7−*.dyn_o
8−*.dyn_hi
9−.virtualenv
10−.hpc
11−.hsenv
12−.cabal-sandbox/
13−cabal.sandbox.config
14−cabal.config
15−*.prof
16−*.aux
17−*.hp
.travis.ymldeleted−34
@@ -1,34 +0,0 @@
1−language: haskell
2−
3−ghc:
4− - 7.8
5−
6−before_install:
7− - git clone https://github.com/haskell-servant/servant.git
8− - git clone https://github.com/haskell-servant/servant-server.git
9− - cabal sandbox init
10− - cabal sandbox add-source servant/
11− - cabal sandbox add-source servant-server/
12−
13−install:
14− - cabal install --only-dependencies --enable-tests
15−
16−script:
17− - cabal configure --enable-tests --enable-library-coverage
18− - cabal build && cabal test
19− - cabal check
20−
21−after_script:
22− - cabal install hpc-coveralls
23− - hpc-coveralls --exclude-dir=test spec
24−
25−notifications:
26− irc:
27− channels:
28− - "irc.freenode.org#servant"
29− template:
30− - "%{repository}#%{build_number} - %{commit} on %{branch} by %{author}: %{message}"
31− - "Build details: %{build_url} - Change view: %{compare_url}"
32− skip_join: true
33− on_success: change
34− on_failure: always
CHANGELOG.md → servant-jquery/CHANGELOG.mdrenamed
The content is the same.
LICENSE → servant-jquery/LICENSErenamed
The content is the same.
README.md → servant-jquery/README.mdrenamed
The content is the same.
Setup.hs → servant-jquery/Setup.hsrenamed
The content is the same.
TODO.md → servant-jquery/TODO.mdrenamed
The content is the same.
docs.sh → servant-jquery/docs.shrenamed
The content is the same.
examples/README.md → servant-jquery/examples/README.mdrenamed
The content is the same.
examples/counter.hs → servant-jquery/examples/counter.hsrenamed
The content is the same.
examples/counter.md → servant-jquery/examples/counter.mdrenamed
The content is the same.
examples/www/api.js → servant-jquery/examples/www/api.jsrenamed
The content is the same.
examples/www/index.html → servant-jquery/examples/www/index.htmlrenamed
The content is the same.
examples/www/jquery.min.js → servant-jquery/examples/www/jquery.min.jsrenamed
The content is the same.
servant-jquery.cabal → servant-jquery/servant-jquery.cabalrenamed
The content is the same.
src/Servant/JQuery.hs → servant-jquery/src/Servant/JQuery.hsrenamed
The content is the same.
src/Servant/JQuery/Internal.hs → servant-jquery/src/Servant/JQuery/Internal.hsrenamed
The content is the same.
test/Servant/JQuerySpec.hs → servant-jquery/test/Servant/JQuerySpec.hsrenamed
The content is the same.
test/Servant/JQuerySpec/CustomHeaders.hs → servant-jquery/test/Servant/JQuerySpec/CustomHeaders.hsrenamed
The content is the same.
test/Spec.hs → servant-jquery/test/Spec.hsrenamed
The content is the same.