Commit graph

1509 commits

Author SHA1 Message Date
Sruthi Chandran
deb547ef73 Remove already packaged embedded modules 2019-09-05 19:10:28 +05:30
Sruthi Chandran
1446d8385e Override lintian false source missing error 2019-09-05 19:03:22 +05:30
Sruthi Chandran
03126720c2 Rename debian/upstream-file-list.new as debian/upstream-file-list 2019-09-05 19:03:22 +05:30
Sruthi Chandran
4bca70b516 Update instruction in debian/upstream-file-count-check.sh 2019-09-04 23:00:52 +05:30
Sruthi Chandran
ad0d778a3b Update install and ignored file lists 2019-09-04 22:46:03 +05:30
Sruthi Chandran
8a1f098df3 Refresh patches and delete obsolete patches 2019-09-04 22:21:00 +05:30
Sruthi Chandran
cc00d41238 Update changelog 2019-09-04 21:03:52 +05:30
Sruthi Chandran
95f0c0ff12 Remove dfsg as the files are removed upstream 2019-09-04 20:58:58 +05:30
Sruthi Chandran
ee31e980e9 Upload to experimental 2019-08-14 17:15:53 +05:30
Sruthi Chandran
af2cd3bde3 Remove already packaged gems from embedded gems (jaeger-client, opentracing and thrift) 2019-08-14 15:47:38 +05:30
Sruthi Chandran
d3b5027d6a Update changelog 2019-08-14 15:24:56 +05:30
Sruthi Chandran
688ef3ecba Update mail id to d.o in control 2019-08-14 15:20:40 +05:30
Pirate Praveen
bb1f27cd5d Update changelog 2019-08-11 13:02:52 +05:30
Pirate Praveen
cdc1b05afe Remove upstream-file-list.new in clean 2019-08-11 12:59:57 +05:30
Pirate Praveen
a6391fb51b Use packaged node-file-loader 2019-08-08 22:47:32 +05:30
Pirate Praveen
2b78405ee2 Use packaged versions of node-url-loader and node-raw-loader 2019-08-08 21:14:53 +05:30
Pirate Praveen
6ccc6565b2 Use packaged node-imports-loader and node-exports-loader 2019-08-08 18:50:45 +05:30
Pirate Praveen
de0ef9f240 Use packaged node-worker-loader and node-cache-loader 2019-08-08 16:47:21 +05:30
Pirate Praveen
72723286f7 Switch to packaged version of webpack 2019-08-08 15:17:34 +05:30
Pirate Praveen
5e38d68984 Update minimum version of gitaly 2019-08-06 15:40:52 +00:00
Pirate Praveen
fc73d1c672 Update changelog 2019-08-06 15:40:22 +00:00
Pirate Praveen
7292979a11 Add ruby-sassc and ruby-jaeger-client as dependency 2019-08-06 15:34:04 +00:00
Dmitry Smirnov
84c5b23ca9 CI: dropped .git directory and added job to build on Buster. 2019-08-04 18:22:03 +10:00
Pirate Praveen
9e37335c56 Tighten dependency on ruby-grpc 2019-08-03 20:17:44 +05:30
Pirate Praveen
e8a8570199 Update dependency on ruby-gitaly-proto 2019-08-03 16:23:52 +05:30
Pirate Praveen
2e195067e7 Tighten dependency on ruby-batch-loader 2019-08-03 15:15:51 +05:30
Pirate Praveen
f7f86f622a Embed gitlab-labkit 2019-08-03 15:15:18 +05:30
Pirate Praveen
2a3f5104a2 Embed sassc-rails 2019-08-03 14:34:24 +05:30
Pirate Praveen
1aa9618b85 Update dependency on ruby-sidekiq and ruby-nokogiri 2019-08-03 14:27:34 +05:30
Pirate Praveen
57e40bf3b0 Embed apollo_upload_server 2019-08-03 11:04:32 +05:30
Pirate Praveen
84f8cb92ee Embed omniauth-salesforce 2019-08-03 10:27:51 +05:30
Pirate Praveen
def209a37b Embed omniauth-ultraauth 2019-08-03 10:13:22 +05:30
Pirate Praveen
3b48cd06ea Add ruby-omniauth-openid-connect as dependency 2019-08-02 23:09:17 +05:30
Pirate Praveen
0b96d56b31 Update embedded rails version to 5.1.7 2019-08-02 22:44:51 +05:30
Pirate Praveen
d13ef26fe3 Install security.txt 2019-07-31 18:58:28 +00:00
Pirate Praveen
9ebbf3e31b Update changelog 2019-07-31 18:32:57 +00:00
Pirate Praveen
618748c37d Bump standards version to 4.4.0 2019-07-31 18:31:44 +00:00
Pirate Praveen
df44416e5d Refresh patches 2019-07-31 18:15:35 +00:00
Praveen Arimbrathodiyil
67c526921e Fix previous commit 2019-07-24 14:05:05 +00:00
Praveen Arimbrathodiyil
8c6542c046 Update minimum version of ruby-fog-google to 1.8.2-2~ 2019-07-24 14:02:58 +00:00
Pirate Praveen
715105270f Tighten dependency on gitaly 2019-07-11 18:04:14 +05:30
Pirate Praveen
c227b12644 Use packaged version of node-d3 2019-07-11 18:03:10 +05:30
Pirate Praveen
72095cd455 Update changelog 2019-07-07 13:19:06 +05:30
Pirate Praveen
4285743f63 Update minimum version of ruby-gitaly-proto 2019-07-07 13:14:30 +05:30
Pirate Praveen
42edcd3694 Refresh patches 2019-07-07 11:29:07 +05:30
Pirate Praveen
3ecb8267ca Use packaged version of vue-resource 2019-06-16 21:26:04 +05:30
Pirate Praveen
713c417864 Use packaged d3-transition and d3-time-format 2019-06-16 15:55:12 +05:30
Pirate Praveen
7633184bd7 Use packaged d3-time, dateformat and webpack-stats-plugin 2019-06-15 16:08:11 +05:30
Pirate Praveen
84e1180dd3 Use packaged bootstrap, three-orbit-control, three-stl-loader, timeago.js
and underscore
2019-06-15 00:17:17 +05:30
Pirate Praveen
52f4ec98a2 Use packaged pikaday and update path in application.scss (Closes: #930529) 2019-06-14 23:20:31 +05:30
Pirate Praveen
d3e20aa434 e package mousetrap, popper.js and raven-js 2019-06-14 20:57:33 +05:30
Pirate Praveen
b84a04fb24 Use packaged jquery.waitforimages, js-cookie, jszip and jszip-utils 2019-06-14 13:11:45 +05:30
Pirate Praveen
96b4a398b2 Use packaged fuzzaldrin-plus, glob, jed, jquery, jquery-ujs 2019-06-13 23:58:02 +05:30
Pirate Praveen
4f5cb69473 Use packaged d3-* sub modules 2019-06-13 23:27:46 +05:30
Pirate Praveen
91cb4f525c Use packaged core-js and css-loader 2019-06-13 22:55:32 +05:30
Pirate Praveen
74d861d179 Use packaged axios, brace-expansion and chart.js 2019-06-13 22:21:11 +05:30
Pirate Praveen
930b173c8b Use packaged version of node-autosize 2019-06-11 21:13:48 +05:30
Pirate Praveen
0e5f19e402 Update changelog 2019-06-05 13:17:25 +05:30
Pirate Praveen
c3b07bf09b Refresh patch 2019-06-05 13:17:25 +05:30
Pirate Praveen
9cba97a0f0 Arrange changelog in chronological order 2019-06-05 12:23:14 +05:30
Abhijith PA
83c7501c26 Reverting to [6328108e] 2019-05-31 06:53:31 +00:00
Abhijith PA
97af045d6e git push origin master-11.8 2019-05-30 18:41:17 +05:30
Abhijith PA
9c0ae08772 update changelog for 11.8.10 2019-05-30 18:40:40 +05:30
Utkarsh Gupta
24b7527dde Update d/changelog 2019-05-21 21:10:03 +05:30
Utkarsh Gupta
cd78470267 Bump devise to 4.6.2 2019-05-21 21:07:14 +05:30
Utkarsh Gupta
e53469079d Add patch to bump devise to 4.6.2 2019-05-21 20:56:07 +05:30
Utkarsh Gupta
d8e0908633 Make yarn.lock writable 2019-05-18 16:23:43 +05:30
Utkarsh Gupta
db6e4bc45c Update d/ch and add myself as an uploader 2019-05-18 01:47:06 +05:30
Pirate Praveen
b4d85bffed Remove obsolete configuration files
(cherry picked from commit 643a01191b)
2019-05-18 01:39:34 +05:30
Abhijith PA
d106cda2f1 remove embedded pdf.js and use libjs-pdf
(cherry picked from commit d9db5ce207)
2019-05-18 01:38:53 +05:30
Utkarsh Gupta
381f17dfcf Update d/upstream-file-list 2019-05-18 01:34:04 +05:30
Utkarsh Gupta
5cdc6a46c3 Do not use --frozen-lockfile with yarnpkg 2019-05-18 01:30:26 +05:30
Utkarsh Gupta
acd33773dc Update version for gitlab-{shell, workhorse}, and gitaly 2019-05-18 01:28:30 +05:30
Utkarsh Gupta
6bcf6e159f Update d/control to update gem versions 2019-05-18 01:25:02 +05:30
Utkarsh Gupta
8d3716f78c Add lintian-overrides for false-positive errors 2019-05-18 01:14:58 +05:30
Utkarsh Gupta
4eacc13567 Update d/changelog with previous entries 2019-05-18 01:13:19 +05:30
Utkarsh Gupta
94815042ff Update d/copyright to exclude pdf.* 2019-05-18 01:06:42 +05:30
Utkarsh Gupta
703fbcc41e Install graphql-tag via yarnpkg 2019-05-18 01:05:44 +05:30
Utkarsh Gupta
7043a3f3b5 Refresh d/patches 2019-05-18 01:04:41 +05:30
Utkarsh Gupta
b960044a5b Update 0050-relax-stable-libs.patch 2019-05-18 00:59:38 +05:30
Utkarsh Gupta
8d5a2ebf0f Update changelog 2019-05-11 07:41:17 +00:00
Utkarsh Gupta
b5eae23a5d Update d/changelog 2019-05-04 01:59:28 +05:30
Utkarsh Gupta
d23a63cf1b Update d/patches/0680-* 2019-05-04 01:48:48 +05:30
Utkarsh Gupta
fa5a783454 Update d/patches/0470-* 2019-05-03 23:39:18 +05:30
Utkarsh Gupta
65c34987a4 Update d/patches/0290-* 2019-05-03 23:31:32 +05:30
Utkarsh Gupta
394d62b06e Update d/patches/0050-* 2019-05-03 20:56:42 +05:30
Abhijith PA
a3ca76cb88 debian/gitlab-ci.yml: with .origtargz not possible to build repacked source 2019-04-19 04:24:29 +00:00
Abhijith PA
0992045963 update changelog 2019-04-19 08:36:55 +05:30
Abhijith PA
be062d56f2 update changelog 2019-04-19 08:36:35 +05:30
Abhijith PA
bf8b095abe update changelog 2019-04-03 18:49:15 +05:30
Sruthi Chandran
a0d812b440 Update changelog 2019-03-22 00:20:26 +05:30
Pirate Praveen
a6e14171be Set minimum version of git to 2.18 2019-03-17 18:48:12 +05:30
Pirate Praveen
b954a1adb5 Update changelog 2019-03-17 18:34:51 +05:30
Pirate Praveen
4cd14ed1c2 Handle migration from rails 4.2 2019-03-17 18:06:09 +05:30
Pirate Praveen
094e408385 Drop patch which expected rails 5.2 2019-03-17 17:22:59 +05:30
Pirate Praveen
4c65ba56e1 Update changelog 2019-03-17 17:02:26 +05:30
Pirate Praveen
afa3a914fd Remove obsolete config files 2019-03-17 17:01:37 +05:30
Pirate Praveen
a233316a77 Tighten dependency on ruby-lograge 2019-03-17 12:53:33 +05:30
Pirate Praveen
1acd00dc1e Set minimum version of ruby to 1:2.5~ and add conflict with libruby2.3 2019-03-17 12:46:35 +05:30
Pirate Praveen
fb1a16b423 Add link to gitlab page on Debian wiki 2019-03-17 11:51:09 +05:30
Pirate Praveen
20d47c212c Yarn is available only as yarnpkg command 2019-03-15 23:05:39 +05:30
Pirate Praveen
77e5b2c195 Update changelog 2019-03-15 22:26:20 +05:30
Pirate Praveen
7c1914a00a Move gitlab-shell dependency to gitlab-common 2019-03-15 22:26:20 +05:30
Pirate Praveen
9a9d5f0bef Tighten dependency on gitaly and gitlab-shell 2019-03-15 22:26:20 +05:30
Pirate Praveen
632e36e758 Remove dependency on npm and use yarnpkg directly instead 2019-03-15 22:26:20 +05:30
Sruthi Chandran
ebd740859e Relax nokogiri 2019-03-15 22:00:32 +05:30
Sruthi Chandran
aa8775e974 Fix typo 2019-03-15 21:42:07 +05:30
Sruthi Chandran
6a6651c0af Remove jwt and omniauth-google-oauth2 from control as they are embedded 2019-03-15 21:34:31 +05:30
Sruthi Chandran
dfcbc7d970 Patch Gemfile to use embedded jwt 2019-03-15 21:34:31 +05:30
Sruthi Chandran
a6c13ce3b5 Embed jwt-2.1.0 2019-03-15 21:16:06 +05:30
Sruthi Chandran
6f9529cc78 Patch Gemfile to used embedded omniauth-google-oauth2 2019-03-15 21:12:51 +05:30
Sruthi Chandran
98c6f15bc9 Embed omniauth-google-oauth2 2019-03-15 21:12:14 +05:30
Sruthi Chandran
2f1aa4583f Refactor tmpfiles.d/ conf files 2019-03-15 18:43:32 +05:30
Sruthi Chandran
cd21646c66 Update changelog 2019-03-14 17:12:37 +05:30
Sruthi Chandran
0f44576248 add thrift gemspec to include-binaries 2019-03-14 17:12:37 +05:30
Sruthi Chandran
9a2e7a3d17 Patch Gemfile to use embedded thrift 2019-03-14 17:12:37 +05:30
Sruthi Chandran
1730a38f1c Embed thrift 2019-03-14 13:35:24 +05:30
Sruthi Chandran
d822bc8110 Patch Gemfile to use embedded jaeger-client 2019-03-14 13:24:35 +05:30
Sruthi Chandran
5a90db87f7 Embed jaeger-client 2019-03-14 13:21:19 +05:30
Sruthi Chandran
d1412c0ef5 Patch Gemfile to use embedded opentracing 2019-03-14 13:14:13 +05:30
Sruthi Chandran
e027f55b03 Embed opentracing 0.4.3 2019-03-14 13:13:30 +05:30
Sruthi Chandran
f7791ef5ea Update changelog 2019-03-13 23:28:01 +05:30
Sruthi Chandran
8682e2a54f Refresh patches and remove 0120-remove-tracing-group.patch 2019-03-13 23:22:21 +05:30
Pirate Praveen
3d3b7c0faa Update changelog 2019-03-12 21:37:31 +05:30
Pirate Praveen
e60aa79f1e Tighten dependency on libjs-uglify 2019-03-12 21:00:58 +05:30
Pirate Praveen
74d498596b Set GEM_PATH for using embedded gems 2019-03-12 20:43:23 +05:30
Pirate Praveen
e93789a259 Use embedded rails 5.1 2019-03-12 20:42:49 +05:30
Pirate Praveen
e243bafc9b Embed rails 5.1 temporarily till gitlab supports rails 5.2 2019-03-12 20:41:51 +05:30
Pirate Praveen
88178d6b0c Remove monkey patch not needed with rails 5.2 2019-03-06 20:10:16 +05:30
Pirate Praveen
f01e92ca67 Create target file of secrets.yml symbolic link 2019-03-06 19:57:08 +05:30
Pirate Praveen
a7e56fdfcc Tighten dependency on googleauth to pull ruby-jwt >= 2.0 2019-03-06 13:50:57 +05:30
Pirate Praveen
72cb5f8f42 Tighten dependency on ruby-oauth2 2019-03-06 12:51:46 +05:30
Pirate Praveen
63309241a4 Tighten dependency on ruby-sidekiq-cron 2019-03-06 12:48:48 +05:30
Pirate Praveen
4fbec836d2 Tighten dependency on ruby-fog* 2019-03-06 12:26:04 +05:30
Pirate Praveen
00f73ea7df Tighten dependency on ruby-pg 2019-03-06 12:20:39 +05:30
Pirate Praveen
01c45f19a5 Replace rails 5.2 patch with rails 5.1 patch from upstream 2019-03-06 11:48:47 +05:30
Pirate Praveen
31dc6eda08 Tighten dependency on ruby-google-api-client 2019-03-05 21:37:32 +05:30
Pirate Praveen
9599e87ae3 Tighten dependency on ruby-omniauth-azure-oauth2 2019-03-05 11:51:38 +05:30
Pirate Praveen
7e4892df08 Tighten dependency on ruby-gitaly-proto 2019-03-05 11:39:26 +05:30
Pirate Praveen
4c9e74537c Remove tracing group from Gemfile 2019-03-04 21:29:59 +05:30
Pirate Praveen
0ae906adad Tighten dependency on ruby-kubeclient 2019-03-04 21:24:48 +05:30
Pirate Praveen
dde79fbd00 Relax dependency on acts-as-taggable-on 2019-03-04 21:07:15 +05:30
Pirate Praveen
dbf55cc3b7 Tighten dependency on ruby-nokogiri 2019-03-04 20:46:45 +05:30
Pirate Praveen
8fd1b31a61 Tighten dependency on ruby-truncato 2019-03-04 20:32:29 +05:30
Pirate Praveen
bf0122a7f6 Bump fog and related gems in Gemfile with upstream patch 2019-03-04 20:18:14 +05:30
Pirate Praveen
13769c502e Update patch to relax pg gem in Gemfile 2019-03-04 20:01:07 +05:30
Pirate Praveen
bfbede42ad Relax dependency on ruby-rack 2019-03-04 18:50:20 +05:30
Pirate Praveen
f6c9df2d5d Refresh patches with fuzz 2019-03-04 18:24:32 +05:30
Sruthi Chandran
1393660c05 Update changelog 2019-03-02 23:09:20 +05:30
Sruthi Chandran
fabb91da5b Refresh patches, remove 0420-relax-js-regex.patch already applied upstream 2019-03-02 23:07:12 +05:30
Dmitry Smirnov
134d89c93d nginx.conf: removed "proxy_set_header X-Forwarded-Proto $scheme;"
When TLS is terminated on load balancer, unencrypted connection is
 established to Nginx which drops "X-Forwarded-Proto" header (if set by the
 load balancer) causing notorious error on (successful) authentication:

    422 The change you requested was rejected
2019-02-22 18:24:00 +11:00
Sruthi Chandran
8f98c93cfa Update changelog 2019-02-15 22:23:36 +05:30
Sruthi Chandran
37a649e3b3 Update debian/upstream-file-count-check.sh to use locale C.UTF8 2019-02-15 22:11:34 +05:30
Sruthi Chandran
416f224b43 Update debian/upstream-file-list 2019-02-15 22:11:34 +05:30
Sruthi Chandran
49c72b9976 Update installed file list 2019-02-15 22:07:37 +05:30
Sruthi Chandran
7ffe579a93 Add a list of files ignored from debian/gitlab.install 2019-02-15 20:54:47 +05:30
Sruthi Chandran
cc0447cea6 Update script to identify new/removed files 2019-02-15 20:52:51 +05:30
Sruthi Chandran
c645e122bb Update deps 2019-02-15 19:01:15 +05:30
Sruthi Chandran
6bc2d85f7b Refresh patches 2019-02-15 18:28:22 +05:30
Sruthi Chandran
e4453685a4 Update changelog 2019-02-13 22:32:40 +05:30
Sruthi Chandran
cf2db36437 Update changelog, merged from master-11.5 2019-02-13 21:49:25 +05:30
Dmitry Smirnov
2f34fa724b clean: remove CI files 2019-01-27 09:06:08 +11:00
Abhijith PA
459d83b9c8 Add team upload to changelog 2019-01-22 11:27:51 +05:30
Abhijith PA
d583248458 merge changelog from master-11.5 2019-01-22 11:27:34 +05:30
Dmitry Smirnov
8cdc515a6d Avoid error in mk-origtargz by clearing Files-Excluded;
That also removes "+dfsg" part from version.
2019-01-15 18:50:42 +11:00
Dmitry Smirnov
320f25e5a5 un-mess changelog 2019-01-15 17:56:28 +11:00
Dmitry Smirnov
6328108eda CI: corrections & new tests 2019-01-15 16:58:35 +11:00
Pirate Praveen
a6c5b7cb89
Always overwrite private copy of gitlab-debian.conf (to add new entries) 2019-01-07 12:39:10 +05:30
Balasankar C
d5fe0f94f1
Add patch to use project link on Salsa in the help page 2019-01-05 17:49:51 +05:30
Balasankar C
7fb73ff66d
Set debian version as env variable 2019-01-05 17:49:51 +05:30
Balasankar C
7bc018b2b8
Add patch to set installation type 2019-01-04 23:02:14 +05:30
Sruthi Chandran
394b793376 Update changelog 2019-01-03 13:29:46 +05:30
Sruthi Chandran
ee75f0f716 Bump Standards-Version to 4.3.0 (no changes needed) 2019-01-03 13:29:46 +05:30
Pirate Praveen
b4d3571df8 Tighten dependency on ruby-grape-path-helpers 2018-12-27 20:33:03 +05:30
Sruthi Chandran
1ef6c104f7 Update changelog and upload to experimental 2018-12-27 15:57:08 +05:30
Sruthi Chandran
ae03eadb7b Set path for yarn 2018-12-27 15:53:07 +05:30
Sruthi Chandran
65dd8e1597 Remove config/initializers/active_record_verbose_query_logs.rb 2018-12-27 15:52:28 +05:30
Sruthi Chandran
82a33ceb93 Add patch 0680-rails-5_2.patch to make it work with rails5.2 2018-12-27 15:50:21 +05:30
Sruthi Chandran
e345e3de97 Update rails-i18n dep version 2018-12-25 13:50:51 +05:30
Sruthi Chandran
d2fe3c484a Fix typo 2018-12-25 13:44:37 +05:30
Sruthi Chandran
f2636f0fcc Relax gitlab-sidekiq-fetcher 2018-12-25 13:39:20 +05:30
Sruthi Chandran
410d4c4ce0 Add patch to relax rails 2018-12-25 13:26:31 +05:30
Sruthi Chandran
4603606b20 Update deps 2018-12-25 13:24:56 +05:30
Sruthi Chandran
21dc2c293e Update changelog 2018-12-24 00:18:29 +05:30
Sruthi Chandran
adb3f9a7ea Don't install .eslintrc.yml 2018-12-24 00:13:16 +05:30
Sruthi Chandran
efca0c78ce Install newly added files 2018-12-24 00:12:55 +05:30
Sruthi Chandran
db132aedf0 Refresh patches 2018-12-24 00:09:40 +05:30
Sruthi Chandran
765f748f62 Update changelog 2018-12-23 22:59:58 +05:30
Sruthi Chandran
9038cc4149 Update changelog 2018-12-21 20:48:56 +05:30
Sruthi Chandran
c7456244d7 Add myself to uploaders 2018-12-21 20:48:56 +05:30
Pirate Praveen
a378c70a7c Add gitaly: client_path to gitlab.yml 2018-12-19 14:49:48 +05:30
Pirate Praveen
1a4c79f9c9 Add golang-any as autopkgtest dependency (to build gitlab-shell) 2018-12-19 11:31:08 +05:30
Pirate Praveen
78d95b6bba Relax dependency on rspec-rails 2018-12-18 23:27:56 +05:30
Pirate Praveen
6f41084f7a Drop autopkgtest dependencies installed from rubygems.org 2018-12-18 23:01:43 +05:30
Pirate Praveen
31b8c37178 Install test only dependencies from rubygems.org for autopkgtest 2018-12-18 23:01:13 +05:30
Pirate Praveen
6cfc40f263 Add Gemfile.autopkgtest to specify test only dependencies 2018-12-18 23:01:13 +05:30
Pirate Praveen
20a881471c Remove optional bullet dependency from Gemfile 2018-12-18 23:01:13 +05:30
Pirate Praveen
849e2a9ef2 Move gitlab-rake to /usr/sbin (depends on /sbin/runuser) 2018-12-18 12:16:40 +05:30
Pirate Praveen
739cdc7332 Explicitly call /usr/bin/bundle to avoid gem installed bundler 2018-12-18 12:14:07 +05:30
Pirate Praveen
a4a65b4d7b Restart gitlab before checks in postinst (fixes failures in some checks) 2018-12-16 20:40:25 +05:30