All times displayed in the project are converted to JalaliDate, the only known...

All times displayed in the project are converted to JalaliDate, the only known exception is Contributors Graph

app/views/admin/groups/index.html.haml

@@ -9,7 +9,7 @@
 %hr
 = form_tag admin_groups_path, method: :get, class: 'form-inline' do
   .form-group
-    = text_field_tag :name, params[:name], class: "form-control input-mn-300", dir: 'auto'
+    = text_field_tag :name, params[:name], class: "form-control input-mn-300", dir: :auto
   = submit_tag "Search", class: "btn submit btn-primary"
 
 %hr
@@ -29,7 +29,7 @@
 
           →
           %span.monospace
-            %strong{ dir: 'auto' } #{group.path}/
+            %strong{ dir: :auto } #{group.path}/
       .clearfix
         %p{ dir: 'auto' }
           = truncate group.description, length: 150

app/views/admin/groups/show.html.haml

@@ -15,21 +15,21 @@
           = image_tag group_icon(@group.path), class: "avatar s60"
         %li
           %span.light Name:
-          %strong{ dir: 'auto' }= @group.name
+          %strong{ dir: :auto }= @group.name
         %li
           %span.light Path:
-          %strong{ dir: 'auto' }
+          %strong{ dir: :auto }
             = @group.path
 
         %li
           %span.light Description:
           %strong
-            %span{ dir: 'auto' }= @group.description
+            %span{ dir: :auto }= @group.description
 
         %li
           %span.light Created on:
-          %strong{ dir: 'auto' }
-            = @group.created_at.stamp("March 1, 1999")
+          %strong{ dir: :auto }
+            = JalaliDate.new(@group.created_at).strftime("%A %d %b %Y")
 
     .panel.panel-default
       .panel-heading
@@ -40,11 +40,11 @@
       %ul.well-list
         - @projects.each do |project|
           %li
-            %strong{ dir: 'auto' }
+            %strong{ dir: :auto }
               = link_to project.name_with_namespace, [:admin, project]
               %span.label.label-gray
                 = repository_size(project)
-            %span.pull-right.light{ dir: 'auto' }
+            %span.pull-right.light{ dir: :auto }
               %span.monospace= project.path_with_namespace + ".git"
       .panel-footer
         = paginate @projects, param_name: 'projects_page', theme: 'gitlab'
@@ -76,7 +76,7 @@
           - user = member.user
           %li{class: dom_class(member), id: dom_id(user)}
             .list-item-name
-              %strong{ dir: 'auto' }
+              %strong{ dir: :auto }
                 = link_to user.name, admin_user_path(user)
             %span.pull-right.light
               = member.human_access

app/views/admin/projects/show.html.haml

@@ -37,7 +37,7 @@
         %li
           %span.light Created on:
           %strong
-            = @project.created_at.stamp("March 1, 1999")
+            = JalaliDate.new(@project.created_at).strftime("%A %d %b %Y")
 
         %li
           %span.light http:

app/views/admin/users/index.html.haml

@@ -60,13 +60,8 @@
               - if user.blocked?
                 %i.fa.fa-lock.cred
               - else
-<<<<<<< HEAD
-                %i.icon-user.cgreen
-              = link_to user.name, [:admin, user], dir: 'auto'
-=======
                 %i.fa.fa-user.cgreen
-              = link_to user.name, [:admin, user]
->>>>>>> v7.4.2
+              = link_to user.name, [:admin, user], dir: :auto
               - if user.admin?
                 %strong.cred (Admin)
               - if user == current_user

app/views/admin/users/show.html.haml

@@ -58,12 +58,12 @@
             %li
               %span.light Member since:
               %strong
-                = @user.created_at.stamp("Nov 12, 2031")
+                = JalaliDate.new(@user.created_at).strftime("%A %d %b %Y")
             - if @user.confirmed_at
               %li
                 %span.light Confirmed at:
                 %strong
-                  = @user.confirmed_at.stamp("Nov 12, 2031")
+                  = JalaliDate.new(@user.confirmed_at).strftime("%A %d %b %Y")
             - else
               %li
                 %span.light Confirmed:
@@ -74,7 +74,7 @@
               %span.light Current sign-in at:
               %strong
                 - if @user.current_sign_in_at
-                  = @user.current_sign_in_at.stamp("Nov 12, 2031")
+                  = JalaliDate.new(@user.current_sign_in_at).strftime("%A %d %b %Y")
                 - else
                   never
 
@@ -82,7 +82,7 @@
               %span.light Last sign-in at:
               %strong
                 - if @user.last_sign_in_at
-                  = @user.last_sign_in_at.stamp("Nov 12, 2031")
+                  = JalaliDate.new(@user.last_sign_in_at).strftime("%A %d %b %Y")
                 - else
                   never
 
@@ -172,7 +172,7 @@
             - group = user_group.group
             %li.group_member
               %span{class: ("list-item-name" unless user_group.owner?)}
-                %strong= link_to group.name, admin_group_path(group), dir: 'auto'
+                %strong= link_to group.name, admin_group_path(group), dir: :auto
               .pull-right
                 %span.light= user_group.human_access
                 - unless user_group.owner?

app/views/profiles/keys/show.html.haml

@@ -9,7 +9,7 @@
           %strong{ dir: :auto }= @key.title
         %li
           %span.light Created on:
-          %strong= @key.created_at.stamp("Aug 21, 2011")
+          %strong= JalaliDate.new(@key.created_at).strftime("%A %d %b %Y")
 
   .col-md-8
     %p

app/views/projects/commits/_commits.html.haml

@@ -3,7 +3,7 @@
     .col-md-2
       %h4
         %i.fa.fa-calendar
-        %span= day.stamp("28 Aug, 2010")
+        %span= JalaliDate.new(day).strftime("%A %d %b %Y")
       %p= pluralize(commits.count, 'commit')
     .col-md-10
       %ul.bordered-list

app/views/projects/deploy_keys/show.html.haml

@@ -3,7 +3,7 @@
   = @key.title
   %small
     created on
-    = @key.created_at.stamp("Aug 21, 2011")
+    = JalaliDate.new(@key.created_at).strftime("%A %d %b %Y")
 .back-link
   = link_to project_deploy_keys_path(@project) do
     ← To keys list

app/views/projects/graphs/commits.html.haml

@@ -3,7 +3,7 @@
 %p.lead
   Commits statistic for
   %strong #{@repository.root_ref}
-  #{@commits_graph.start_date.strftime('%b %d')} - #{@commits_graph.end_date.strftime('%b %d')}
+  %span{ dir: :auto }#{JalaliDate.new(@commits_graph.end_date).strftime("%d %b")} - #{JalaliDate.new(@commits_graph.start_date).strftime("%d %b")}
 
 .row
   .col-md-6

app/views/projects/show.html.haml

@@ -54,7 +54,7 @@
         .prepend-top-10
           %p
             %span.light Created on
-            #{@project.created_at.stamp('Aug 22, 2013')}
+            #{JalaliDate.new(@project.created_at).strftime("%A %d %b %Y")}
           %p
             %span.light Owned by
             - if @project.group

app/views/users/_profile.html.haml

@@ -4,11 +4,11 @@
   %ul.well-list
     %li
       %span.light Member since
-      %strong= user.created_at.stamp("Aug 21, 2011")
+      %strong= JalaliDate.new(user.created_at).strftime("%A %d %b %Y")
     - unless user.skype.blank?
       %li
         %span.light Skype:
-        %strong= link_to user.skype, "skype:#{user.skype}", dir: 'auto'
+        %strong= link_to user.skype, "skype:#{user.skype}", dir: :auto
     - unless user.linkedin.blank?
       %li
         %span.light LinkedIn:
@@ -16,11 +16,11 @@
     - unless user.twitter.blank?
       %li
         %span.light Twitter:
-        %strong= link_to user.twitter, "http://www.twitter.com/#{user.twitter}", dir: 'auto'
+        %strong= link_to user.twitter, "http://www.twitter.com/#{user.twitter}", dir: :auto
     - unless user.website_url.blank?
       %li
         %span.light Website:
-        %strong= link_to user.short_website_url, user.full_website_url, dir: 'auto'
+        %strong= link_to user.short_website_url, user.full_website_url, dir: :auto
     - unless user.bio.blank?
       %li
         %span.light Bio:

app/views/users/show.html.haml

@@ -11,7 +11,7 @@
       %br
       %span.user-show-username #{@user.username}
       %br
-      %small member since #{@user.created_at.stamp("Nov 12, 2031")}
+      %small member since #{JalaliDate.new(@user.created_at).strftime("%A %d %b %Y")}
     .clearfix
 
     - if @groups.any?