summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* switch mustache imlementation to https://github.com/soranoba/mustacheTristan Sloughter2015-05-052-231/+277
|
* fix }}} bug in mustacheTristan Sloughter2015-05-051-1/+1
|
* set resources to empty list if non in app envTristan Sloughter2015-05-041-1/+6
|
* set resources of state in state initialize functionsTristan Sloughter2015-05-042-15/+20
|
* handle missing package in registry by skippingTristan Sloughter2015-05-044-14/+18
|
* Merge pull request #384 from ferd/rework-deps-providerTristan Sloughter2015-05-041-48/+45
|\ | | | | Fix dupes in deps provider, support atom pkgs
| * Fix dupes in deps provider, support atom pkgsFred Hebert2015-05-041-48/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever files were being locked *and* provided in rebar.config duplicates could be printed. This is taken care of. Also whenever atom packages were being used, they would cause the merge step to fail. The new format does proper name-based deduplication of resources, giving priority to locks to work. ModificatioN/needs-update support is still in. This may also act as a fix for #341, if automation isn't required too much.
* | Merge pull request #383 from ferd/kovyl2404-app-discover-profile-duplicationFred Hebert2015-05-043-9/+171
|\ \ | | | | | | Kovyl2404 app discover profile duplication
| * | Adding directory path test for deduplicationFred Hebert2015-05-041-0/+18
| | |
| * | Merge branch 'app-discover-profile-duplication' of ↵Fred Hebert2015-05-043-9/+153
| |\ \ | | |/ | |/| | | | https://github.com/kovyl2404/rebar3 into kovyl2404-app-discover-profile-duplication
| | * Merge branch 'master' into app-discover-profile-duplicationViacheslav V. Kovalev2015-05-0149-370/+1022
| | |\ | | | | | | | | | | | | | | | | Conflicts: test/rebar_profiles_SUITE.erl
| | * | Revert accidentially changed formattingViacheslav V. Kovalev2015-04-223-4/+4
| | | |
| | * | Merge remote-tracking branch 'my/app-discover-profile-duplication' into ↵Viacheslav V. Kovalev2015-04-223-30/+8
| | |\ \ | | | | | | | | | | | | | | | app-discover-profile-duplication
| | | * | Get rid of rebar_utils:tup_umerge/2 patchingViacheslav Kovalev2015-04-223-30/+8
| | | | |
| | * | | Merge branch 'app-discover-profile-duplication' of ↵Viacheslav V. Kovalev2015-04-224-5/+96
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/kovyl2404/rebar3 into app-discover-profile-duplication Conflicts: test/rebar_profiles_SUITE.erl
| | | * | Implement opts umerge deduplicationViacheslav Kovalev2015-04-224-24/+69
| | | | |
| | | * | Implement some test on profiles deduplicationViacheslav V. Kovalev2015-04-222-2/+113
| | | | |
| | * | | Implement some test on profiles deduplicationViacheslav V. Kovalev2015-04-211-0/+65
| | |/ /
| | * | Correctly deduplicate profiles when applyingViacheslav V. Kovalev2015-04-212-12/+19
| | | | | | | | | | | | | | | | | | | | Conflicts: src/rebar_state.erl
| | * | Do not duplicate profile when applying.Viacheslav V. Kovalev2015-04-191-1/+5
| | | |
* | | | Merge pull request #386 from tsloughter/relx_templatesFred Hebert2015-05-041-1/+3
|\ \ \ \ | |/ / / |/| | | include relx templates in escript
| * | | include relx templates in escriptTristan Sloughter2015-05-041-1/+3
| | | |
* | | | Merge pull request #381 from tsloughter/upgrade_branchFred Hebert2015-05-034-11/+9
|\ \ \ \ | |/ / / | | | | on upgrade of git branch check against remote
| * | | only fetch branch needed, remove rebar_vsn_plugins from erlware_commonsTristan Sloughter2015-05-033-7/+3
| | | |
| * | | on upgrade of git branch check against remoteTristan Sloughter2015-05-032-5/+7
|/ / /
* | | Merge pull request #382 from tsloughter/upgrade_relxFred Hebert2015-05-031-2/+2
|\ \ \ | | | | | | | | upgrade relx dep to latest mustache branch commit
| * | | upgrade relx dep to latest mustache branch commitTristan Sloughter2015-05-031-2/+2
| | | |
* | | | Merge pull request #379 from tsloughter/rm_erlydtlFred Hebert2015-05-0128-475/+295
|\ \ \ \ | |/ / / | | | | Remove erlydtl and replace with mustache
| * | | remove use of erlydtl in rebarTristan Sloughter2015-04-2928-475/+295
| | | |
* | | | Merge pull request #375 from tsloughter/kejv-support-parse-transformsFred Hebert2015-04-302-8/+52
|\ \ \ \ | |_|_|/ |/| | | enable parse transformations in rebar config
| * | | enable parse transformations in rebar configTristan Sloughter2015-04-264-11/+55
| |/ /
* | | Merge pull request #378 from tsloughter/loading_registryFred Hebert2015-04-293-16/+25
|\ \ \ | |/ / |/| | don't load package registry unless there are pkg deps to solve
| * | don't load package registry unless there are pkg deps to solveTristan Sloughter2015-04-283-16/+25
|/ /
* | Merge pull request #373 from tsloughter/checkouts_relFred Hebert2015-04-252-2/+4
|\ \ | | | | | | include _checkouts in release lib dirs if it exists
| * | include _checkouts in release lib dirs if it existsTristan Sloughter2015-04-252-2/+4
|/ /
* | Merge pull request #371 from tsloughter/fetch_app_detailsTristan Sloughter2015-04-252-1/+23
|\ \ | | | | | | read in application details into app_info after fetch
| * | read in application details into app_info after fetchTristan Sloughter2015-04-242-1/+23
| | |
* | | Merge pull request #372 from ferd/optimize-topsortingTristan Sloughter2015-04-251-16/+6
|\ \ \ | |/ / |/| | Avoid topsorting deps twice
| * | Avoid topsorting deps twiceFred Hebert2015-04-251-16/+6
|/ / | | | | | | They can be culled and reused in one sort pass.
* | Merge pull request #369 from tsloughter/noescriptFred Hebert2015-04-241-7/+25
|\ \ | | | | | | support templates even when not run as escript
| * | support templates even when not run as escriptTristan Sloughter2015-04-241-7/+25
| | |
* | | Merge pull request #368 from ferd/fix-upgrade-promoteTristan Sloughter2015-04-232-13/+33
|\ \ \ | | | | | | | | handle transitive deps being promoted
| * | | handle transitive deps being promotedFred Hebert2015-04-242-13/+33
| | | |
* | | | Merge pull request #367 from tsloughter/merge_locksFred Hebert2015-04-231-1/+1
|\ \ \ \ | | |/ / | |/| | merge_locks crashed if a config didn't have a deps entry
| * | | merge_locks crashed if a config didn't have a deps entryTristan Sloughter2015-04-231-1/+1
| | | |
* | | | Merge pull request #366 from tsloughter/no_header_warnFred Hebert2015-04-231-4/+0
|\ \ \ \ | |/ / / | | / / | |/ / |/| | remove warning if header not found, could be in a macro
| * | remove warning if header not found, could be in a macroTristan Sloughter2015-04-231-4/+0
| | |
* | | Merge pull request #365 from tsloughter/otp18Fred Hebert2015-04-235-10/+102
|\ \ \ | |/ / | | | Support 18.0+
| * | support for 18.0+Tristan Sloughter2015-04-235-9/+59
| | |
| * | print and halt on compile errorTristan Sloughter2015-04-231-2/+44
|/ /
generated by cgit v1.1 at 2024-12-24 03:28:40 +0000