Eliminate Gravatar profile linking and improve api

James Moger

2014-03-03 94e12c168f5eec300fd23d0de25c7dc93a96c429

 src/main/java/com/gitblit/wicket/panels/ReflogPanel.java

@@ -110,13 +110,6 @@
   }



   protected void setup(List<RefLogEntry> changes) {

      final int hashLen = app().settings().getInteger(Keys.web.shortCommitIdLength, 6);



      String dateFormat = app().settings().getString(Keys.web.datetimestampLongFormat, "EEEE, MMMM d, yyyy HH:mm Z");

      final TimeZone timezone = getTimeZone();

      final DateFormat df = new SimpleDateFormat(dateFormat);

      df.setTimeZone(timezone);

      final Calendar cal = Calendar.getInstance(timezone);



      ListDataProvider<RefLogEntry> dp = new ListDataProvider<RefLogEntry>(changes);

      DataView<RefLogEntry> changeView = new DataView<RefLogEntry>("change", dp) {

@@ -125,6 +118,13 @@
         @Override

         public void populateItem(final Item<RefLogEntry> changeItem) {

            final RefLogEntry change = changeItem.getModelObject();



            String dateFormat = app().settings().getString(Keys.web.datetimestampLongFormat, "EEEE, MMMM d, yyyy HH:mm Z");

            TimeZone timezone = getTimeZone();

            DateFormat df = new SimpleDateFormat(dateFormat);

            df.setTimeZone(timezone);

            Calendar cal = Calendar.getInstance(timezone);



            String fullRefName = change.getChangedRefs().get(0);

            String shortRefName = fullRefName;

            boolean isTag = false;

@@ -149,8 +149,8 @@
                   cal.set(Calendar.MINUTE, 0);

                   cal.set(Calendar.SECOND, 0);

                   cal.set(Calendar.MILLISECOND, 0);

                   changeDate = cal.getTime();

               fuzzydate = getTimeUtils().timeAgo(changeDate);

                   Date date = cal.getTime();

               fuzzydate = getTimeUtils().timeAgo(date);

            }

            changeItem.add(new Label("whenChanged", fuzzydate + ", " + df.format(changeDate)));



@@ -259,8 +259,7 @@
                  final RepositoryCommit commit = commitItem.getModelObject();



                  // author gravatar

                  commitItem.add(new GravatarImage("commitAuthor", commit.getAuthorIdent().getName(),

                        commit.getAuthorIdent().getEmailAddress(), null, 16, false, false));

                  commitItem.add(new GravatarImage("commitAuthor", commit.getAuthorIdent(), null, 16, false));



                  // merge icon

                  if (commit.getParentCount() > 1) {

@@ -286,6 +285,7 @@
                  commitItem.add(shortlog);



                  // commit hash link

                  int hashLen = app().settings().getInteger(Keys.web.shortCommitIdLength, 6);

                  LinkPanel commitHash = new LinkPanel("hashLink", null, commit.getName().substring(0, hashLen),

                        CommitPage.class, WicketUtils.newObjectParameter(

                              change.repository, commit.getName()));