annotated tag v1.7 created (now 052ad15)
This is an automated email from the git hooks/post-receive script. New change to annotated tag v1.7 in repository jredmine. See https://gitlab.nuiton.org/nuiton/jredmine.git at 052ad15 (tag) tagging c463a7af610b0f548e2f6e12c9c7359c3b0a85b6 (commit) replaces jredmine-1.3 tagged by Tony Chemit on Wed Apr 16 09:43:25 2014 +0000 - Log ----------------------------------------------------------------- fix release build ----------------------------------------------------------------------- This annotated tag includes the following new commits: new e21a707 [maven-release-plugin] copy for tag jredmine-1.7 new 22b29ea refs #3151 (fix old login way) new c463a7a fix release build The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c463a7af610b0f548e2f6e12c9c7359c3b0a85b6 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Apr 16 09:43:25 2014 +0000 fix release build commit 22b29eae4e71254fc17f7ea7ba7e1ce9c9a140b4 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Apr 16 09:40:31 2014 +0000 refs #3151 (fix old login way) commit e21a7079f05ee88a161deb705dd8cc5f110b8508 Author: Maven Release <maven-release@nuiton.org> Date: Wed Apr 16 08:42:21 2014 +0000 [maven-release-plugin] copy for tag jredmine-1.7 -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to annotated tag v1.7 in repository jredmine. See https://gitlab.nuiton.org/nuiton/jredmine.git commit e21a7079f05ee88a161deb705dd8cc5f110b8508 Author: Maven Release <maven-release@nuiton.org> Date: Wed Apr 16 08:42:21 2014 +0000 [maven-release-plugin] copy for tag jredmine-1.7 -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to annotated tag v1.7 in repository jredmine. See https://gitlab.nuiton.org/nuiton/jredmine.git commit 22b29eae4e71254fc17f7ea7ba7e1ce9c9a140b4 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Apr 16 09:40:31 2014 +0000 refs #3151 (fix old login way) --- .../app/controllers/jredmine_controller.rb | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb b/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb index dc3c707..46b0973 100644 --- a/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb +++ b/jredmine-client/src/main/redmine/jredmine-2.x/app/controllers/jredmine_controller.rb @@ -54,6 +54,7 @@ class JredmineController < ActionController::Base end # Login request and validation + # Deprecated since 1.7, will be removed in version 2.0 def login if !request.post? # Logout user : get method not possible @@ -81,6 +82,7 @@ class JredmineController < ActionController::Base end # Log out current user and redirect to welcome page + # Deprecated since 1.7, will be removed in version 2.0 def logout cookies.delete :autologin Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin']) if User.current.logged? @@ -488,6 +490,35 @@ class JredmineController < ActionController::Base User.current = user end + # Returns the current user or nil if no user is logged in + # Deprecated since 1.7, will be removed in version 2.0 + def find_current_user + user = nil + if session[:user_id] + # existing session + user = (User.active.find(session[:user_id]) rescue nil) + elsif cookies[:autologin] + # auto-login feature + user = User.find_by_autologin_key(cookies[:autologin]) + end + if user.nil? && Setting.rest_api_enabled? + if (key = api_key_from_request) + # Use API key + user = User.find_by_api_key(key) + else + # HTTP Basic, either username/password or API key/random + authenticate_with_http_basic do |username, password| + user = User.try_to_login(username, password) || User.find_by_api_key(username) + end + end + end + if user.nil? + # Last chance using request params + user = User.try_to_login(params[:username], params[:password]) + end + user + end + # Returns the API key present in the request def api_key_from_request if params[:key].present? -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to annotated tag v1.7 in repository jredmine. See https://gitlab.nuiton.org/nuiton/jredmine.git commit c463a7af610b0f548e2f6e12c9c7359c3b0a85b6 Author: Tony Chemit <chemit@codelutin.com> Date: Wed Apr 16 09:43:25 2014 +0000 fix release build --- jredmine-maven-plugin/pom.xml | 115 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/jredmine-maven-plugin/pom.xml b/jredmine-maven-plugin/pom.xml index 6f9bd4c..8ed6965 100644 --- a/jredmine-maven-plugin/pom.xml +++ b/jredmine-maven-plugin/pom.xml @@ -292,5 +292,120 @@ </build> </profile> +<!-- For post-release actions --> + <profile> + <id>post-release-profile</id> + <properties> + + <!-- templates location --> + <redmine.templateDirectory> + https://doc.nuiton.org/mavenpom/announcement/redmine + </redmine.templateDirectory> + </properties> + + <build> + + <defaultGoal>validate</defaultGoal> + + <plugins> + + <!-- + - publish attachments + - generate news announcement + - generate email announcement + - update version + - publish news announcement + - create next version + --> + <plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>jredmine-maven-plugin</artifactId> + <executions> + <execution> + <id>publish-attachments</id> + <goals> + <goal>publish-attachments</goal> + </goals> + <phase>verify</phase> + <configuration> + <filesFromProperties> + ${redmine.collectedAttachments} + </filesFromProperties> + + <skipPublishAttachments> + ${skipReleasePublishAttachments} + </skipPublishAttachments> + </configuration> + </execution> + <execution> + <id>generate-announcements</id> + <goals> + <goal>generate-news-announcement</goal> + <goal>generate-email-announcement</goal> + </goals> + <phase>verify</phase> + <configuration> + <announceParameters> + <releaseProjectGroupId> + ${session.topLevelProject.groupId} + </releaseProjectGroupId> + <releaseProjectArtifactId> + ${session.topLevelProject.artifactId} + </releaseProjectArtifactId> + <releaseProjectVersion> + ${session.topLevelProject.version} + </releaseProjectVersion> + </announceParameters> + <skipGenerateEmailAnnouncement> + ${skipReleaseSendEmail} + </skipGenerateEmailAnnouncement> + <skipGenerateNewsAnnouncement> + ${skipReleasePublishNews} + </skipGenerateNewsAnnouncement> + <anonymous>${publicProject}</anonymous> + <urlDownload> + ${redmine.url}/projects/${projectId}/files + </urlDownload> + <artifactsFile>${redmine.collectedArtifacts}</artifactsFile> + </configuration> + </execution> + + <execution> + <id>jredmine-release</id> + <goals> + <goal>update-version</goal> + <goal>publish-news</goal> + </goals> + <phase>install</phase> + <configuration> + <!-- for a multi-module just run on root project --> + <runOnce>true</runOnce> + <skipUpdateVersion> + ${skipReleaseUpdateVersion} + </skipUpdateVersion> + <skipPublishNews>${skipReleasePublishNews}</skipPublishNews> + + <!-- udpate-version --> + <closeVersion>true</closeVersion> + + <!-- publish-news --> + <newsContentFile> + target/generated-sources/announcement/release-news-announcement.vm + </newsContentFile> + <newsSummary>${project.description}</newsSummary> + <newsTitle> + ${releaseAnnouncementTitle} + </newsTitle> + </configuration> + </execution> + </executions> + + </plugin> + + </plugins> + + </build> + </profile> + </profiles> </project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm