I can’t apply this patch. Take a look:
benji@Wloups ~/Projets/ProjXP_git/projxp % git branch
* devel
master
benji@Wloups ~/Projets/ProjXP_git/projxp % git pull
Already up-to-date.
benji@Wloups ~/Projets/ProjXP_git/projxp % git checkout -b test
Switched to a new branch "test"
benji@Wloups ~/Projets/ProjXP_git/projxp % git am test.patch
Applying: Mailer configuration is moved to the database. #124
error: patch failed: app/views/sprints/plan.html.erb:20
error: app/views/sprints/plan.html.erb: patch does not apply
error: patch failed: db/schema.rb:25
error: db/schema.rb: patch does not apply
Patch failed at 0001.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
--
Benjamin LAN-SUN-LUK
Le 28/12/08 05:13, « Darryl L. Pierce » <mcpierce@gmail.com> a écrit :
This patch requires a migration. It introduces a new database, called
config_properties, that holds site configuration details. It also adds
a new column to the user_privileges table called site_admin. Users with
this privilege are able to access and change site configuration
properties.
A configuration property is composed of a name and a value. Names are
hierarchical is nature, with each segment separated by a period (.). So,
for example, the email server name is "email.server.name".
This patch moves the content of config/mailer.yml to the database.
To access the configuration, the user goes to /admin/email. The new controller,
EmailController, extends the equally new AdminController. All administration
controllers must extend this base class to inherit admin functionality.
_______________________________________________
projxp-devel mailing list
projxp-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/projxp-devel