Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Magento and grails #968

Closed
wants to merge 10 commits into from

2 participants

@lrkwz

New ignore's for magento and grails latest versions

@arcresu
Collaborator

Thanks for this. In the future, it would be better if you could submit different PRs for different templates.

Note that IDE-specific rules go under the relevant templates in Global/, so for example .iws should only appear in Global/JetBrains.gitignore, and not in the Grails template. Similar for the eclipse-specific rule.

For the Magento template, can you explain why api.php should be ignored by default?

Magento.gitignore
@@ -37,12 +38,14 @@ app/etc/modules/Phoenix_Moneybookers.xml
app/etc/modules/Cm_RedisSession.xml
app/etc/config.xml
app/etc/enterprise.xml
+app/etc/local.xml
@arcresu Collaborator
arcresu added a note

This rule already exists three lines down.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@lrkwz

I would ignore api.php as part of the standard magento install as index.php

Grails.gitignore
@@ -27,4 +28,5 @@
/web-app/plugins
# "temporary" build files
-/target
+
+# other
@arcresu Collaborator
arcresu added a note

This doesn't need to be here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Grails.gitignore
@@ -27,4 +28,5 @@
/web-app/plugins
# "temporary" build files
-/target
@arcresu Collaborator
arcresu added a note

What will be the impact of removing this rule? Is it something specific to Grails 2.x that should actually still be there for older versions?

@lrkwz
lrkwz added a note

Grails will drop the compiled files into /target so IMHO it shouldn't be versioned.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@arcresu
Collaborator

I've left a couple of inline comments. Also, I'm sorry but I think I've changed my mind: could you please submit these as separate PRs (one per template) after all? The reason is that I'm not convinced that what we're doing with the Magento template is a good idea, and your other changes are independent of this concern.

It will make it a lot easier to advance this if you can explain the need for new rules (e.g. the file is cached data, or contains sensitive information, or something else), as per our contributing guidelines. Thanks!

@arcresu
Collaborator

See #985 for my reasoning about the Magento template.

@arcresu
Collaborator

I'll close this since the PR needs to be split up, and it's a bit hard to judge if these changes are a good idea. Feel free to open up new individual PRs if you're still interested in this. Thanks!

@arcresu arcresu closed this
@lrkwz
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 27, 2013
  1. @lrkwz

    Magento 1.7.0.2

    lrkwz authored
Commits on Sep 12, 2013
  1. @lrkwz
Commits on Feb 5, 2014
  1. @lrkwz
Commits on Feb 27, 2014
  1. @lrkwz

    Ignored eclipse target dir

    lrkwz authored
  2. @lrkwz

    Ignore plugin's digest

    lrkwz authored
  3. @lrkwz

    Merged

    lrkwz authored
Commits on Mar 3, 2014
  1. @lrkwz

    Removed duplicate line

    lrkwz authored
Commits on Mar 4, 2014
  1. @lrkwz
Commits on Mar 25, 2014
  1. @lrkwz
  2. @lrkwz
This page is out of date. Refresh to see the latest.
View
2  Global/Eclipse.gitignore
@@ -2,6 +2,8 @@
.metadata
.gradle
bin/
+target/
+target-eclipse/
tmp/
*.tmp
*.bak
View
5 Grails.gitignore
@@ -1,4 +1,4 @@
-# .gitignore for Grails 1.2 and 1.3
+# .gitignore for Grails 1.2, 1.3 and 2.x
# web application files
/web-app/WEB-INF/classes
@@ -20,6 +20,7 @@
# plugin release files
/*.zip
+/*.zip.sha1
/plugin.xml
# older plugin install locations
@@ -28,3 +29,5 @@
# "temporary" build files
/target
+
+# other
View
2  Magento.gitignore
@@ -1,4 +1,5 @@
.modgit/
+api.php
app/code/community/Find/
app/code/community/Phoenix/
app/code/community/Cm/
@@ -44,6 +45,7 @@ app/etc/local.xml
app/.htaccess
app/locale/
app/Mage.php
+cache/
cron.php
cron.sh
downloader/
Something went wrong with that request. Please try again.