Download as
Browse Code »

Commit 92ef845fa5fdf0ffbc50e0a35cf366765fbfc631

Authored by Dmitriy Zaporozhets
2 parents 51818169 f1fc1ae6
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'master' into 6-0-dev 

Conflicts:
	VERSION
Showing 2 changed files with 10 additions and 3 deletions   Show diff stats
@@ -26,6 +26,11 @@ v 5.4.0 @@ -26,6 +26,11 @@ v 5.4.0
26 - Misspelling fixes 26 - Misspelling fixes
27 - Added support of unicorn and fog gems 27 - Added support of unicorn and fog gems
28 - Added client list to API doc 28 - Added client list to API doc
  29 + - Fix PostgreSQL database restoration problem
  30 + - Increase snippet content column size
  31 + - allow project import via git:// url
  32 + - Show participants on issues, including mentions
  33 + - Notify mentioned users with email
29 34
30 v 5.3.0 35 v 5.3.0
31 - Refactored services 36 - Refactored services
lib/support/init.d/gitlab
  Diff comments   View file @92ef845
@@ -20,6 +20,7 @@ APP_USER="git" @@ -20,6 +20,7 @@ APP_USER="git"
20 DAEMON_OPTS="-C $APP_ROOT/config/puma.rb" 20 DAEMON_OPTS="-C $APP_ROOT/config/puma.rb"
21 PID_PATH="$APP_ROOT/tmp/pids" 21 PID_PATH="$APP_ROOT/tmp/pids"
22 SOCKET_PATH="$APP_ROOT/tmp/sockets" 22 SOCKET_PATH="$APP_ROOT/tmp/sockets"
  23 +SOCKET_FILE="$SOCKET_PATH/gitlab.socket"
23 WEB_SERVER_PID="$PID_PATH/puma.pid" 24 WEB_SERVER_PID="$PID_PATH/puma.pid"
24 SIDEKIQ_PID="$PID_PATH/sidekiq.pid" 25 SIDEKIQ_PID="$PID_PATH/sidekiq.pid"
25 STOP_SIDEKIQ="RAILS_ENV=production bundle exec rake sidekiq:stop" 26 STOP_SIDEKIQ="RAILS_ENV=production bundle exec rake sidekiq:stop"
@@ -51,7 +52,7 @@ start() { @@ -51,7 +52,7 @@ start() {
51 exit 1 52 exit 1
52 else 53 else
53 if [ `whoami` = root ]; then 54 if [ `whoami` = root ]; then
54 - execute "rm -f $SOCKET_PATH/gitlab.socket" 55 + ! [ -e $SOCKET_FILE ] || execute "rm $SOCKET_FILE"
55 execute "RAILS_ENV=production bundle exec puma $DAEMON_OPTS" 56 execute "RAILS_ENV=production bundle exec puma $DAEMON_OPTS"
56 execute "mkdir -p $PID_PATH && $START_SIDEKIQ > /dev/null 2>&1 &" 57 execute "mkdir -p $PID_PATH && $START_SIDEKIQ > /dev/null 2>&1 &"
57 echo "$DESC started" 58 echo "$DESC started"
@@ -65,12 +66,13 @@ stop() { @@ -65,12 +66,13 @@ stop() {
65 if [ "$PID" -ne 0 -a "$STATUS" -ne 0 ]; then 66 if [ "$PID" -ne 0 -a "$STATUS" -ne 0 ]; then
66 ## Program is running, stop it. 67 ## Program is running, stop it.
67 kill -QUIT `cat $WEB_SERVER_PID` 68 kill -QUIT `cat $WEB_SERVER_PID`
  69 + ! [ -e $SOCKET_FILE ] || execute "rm $SOCKET_FILE"
68 execute "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1 &" 70 execute "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1 &"
69 rm "$WEB_SERVER_PID" >> /dev/null 71 rm "$WEB_SERVER_PID" >> /dev/null
70 echo "$DESC stopped" 72 echo "$DESC stopped"
71 else 73 else
72 ## Program is not running, exit with error. 74 ## Program is not running, exit with error.
73 - echo "Error! $DESC not started!" 75 + echo "Error! $DESC is not started!"
74 exit 1 76 exit 1
75 fi 77 fi
76 } 78 }
@@ -81,7 +83,7 @@ restart() { @@ -81,7 +83,7 @@ restart() {
81 if [ "$PID" -ne 0 -a "$STATUS" -ne 0 ]; then 83 if [ "$PID" -ne 0 -a "$STATUS" -ne 0 ]; then
82 echo "Restarting $DESC..." 84 echo "Restarting $DESC..."
83 kill -USR2 `cat $WEB_SERVER_PID` 85 kill -USR2 `cat $WEB_SERVER_PID`
84 - execute "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1 &" 86 + execute "mkdir -p $PID_PATH && $STOP_SIDEKIQ > /dev/null 2>&1"
85 if [ `whoami` = root ]; then 87 if [ `whoami` = root ]; then
86 execute "mkdir -p $PID_PATH && $START_SIDEKIQ > /dev/null 2>&1 &" 88 execute "mkdir -p $PID_PATH && $START_SIDEKIQ > /dev/null 2>&1 &"
87 fi 89 fi