Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
15bb2f91
Commit
15bb2f91
authored
May 02, 2018
by
Matija Čupić
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pipeline-from-the-ui
parents
d03cd7b4
c7c9f38d
Changes
40
Hide whitespace changes
Inline
Side-by-side
Showing
40 changed files
with
178 additions
and
155 deletions
+178
-155
app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
...idebar/components/subscriptions/sidebar_subscriptions.vue
+7
-1
app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
...cripts/sidebar/components/subscriptions/subscriptions.vue
+2
-1
app/assets/javascripts/sidebar/components/time_tracking/no_tracking_pane.js
...ipts/sidebar/components/time_tracking/no_tracking_pane.js
+0
-10
app/assets/javascripts/sidebar/components/time_tracking/no_tracking_pane.vue
...pts/sidebar/components/time_tracking/no_tracking_pane.vue
+13
-0
app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.vue
...idebar/components/time_tracking/sidebar_time_tracking.vue
+19
-16
app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
...scripts/sidebar/components/time_tracking/time_tracker.vue
+2
-2
app/assets/javascripts/sidebar/mount_sidebar.js
app/assets/javascripts/sidebar/mount_sidebar.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
...rge_request_widget/components/states/work_in_progress.vue
+44
-35
app/assets/javascripts/vue_merge_request_widget/dependencies.js
...sets/javascripts/vue_merge_request_widget/dependencies.js
+1
-1
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
...javascripts/vue_merge_request_widget/mr_widget_options.js
+2
-2
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+2
-2
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
app/services/merge_requests/merge_service.rb
app/services/merge_requests/merge_service.rb
+19
-10
app/views/admin/projects/show.html.haml
app/views/admin/projects/show.html.haml
+1
-1
app/views/admin/runners/_runner.html.haml
app/views/admin/runners/_runner.html.haml
+1
-1
app/views/admin/runners/show.html.haml
app/views/admin/runners/show.html.haml
+1
-1
app/views/admin/services/index.html.haml
app/views/admin/services/index.html.haml
+1
-2
app/views/devise/mailer/unlock_instructions.html.haml
app/views/devise/mailer/unlock_instructions.html.haml
+1
-1
app/views/devise/mailer/unlock_instructions.text.erb
app/views/devise/mailer/unlock_instructions.text.erb
+1
-1
app/views/projects/jobs/_sidebar.html.haml
app/views/projects/jobs/_sidebar.html.haml
+1
-1
app/views/projects/registry/repositories/_tag.html.haml
app/views/projects/registry/repositories/_tag.html.haml
+1
-1
app/views/projects/runners/show.html.haml
app/views/projects/runners/show.html.haml
+1
-1
app/views/projects/services/_index.html.haml
app/views/projects/services/_index.html.haml
+1
-2
app/views/projects/triggers/_trigger.html.haml
app/views/projects/triggers/_trigger.html.haml
+1
-1
app/views/sherlock/transactions/_general.html.haml
app/views/sherlock/transactions/_general.html.haml
+1
-2
app/views/sherlock/transactions/index.html.haml
app/views/sherlock/transactions/index.html.haml
+1
-2
changelogs/unreleased/45761-replace-actionview-time_ago_in_words.yml
...unreleased/45761-replace-actionview-time_ago_in_words.yml
+5
-0
changelogs/unreleased/increase-new-issue-metadata-form-margin.yml
...gs/unreleased/increase-new-issue-metadata-form-margin.yml
+5
-0
changelogs/unreleased/jprovazn-generic-error.yml
changelogs/unreleased/jprovazn-generic-error.yml
+6
-0
changelogs/unreleased/refactor-move-mr-widget-wip-vue-component.yml
.../unreleased/refactor-move-mr-widget-wip-vue-component.yml
+5
-0
changelogs/unreleased/refactor-move-no-tracking-pane-vue-component.yml
...released/refactor-move-no-tracking-pane-vue-component.yml
+5
-0
changelogs/unreleased/refactor-move-sidebar-time-tracking-vue-component.yml
...sed/refactor-move-sidebar-time-tracking-vue-component.yml
+5
-0
changelogs/unreleased/zj-namespace-service-mandatory.yml
changelogs/unreleased/zj-namespace-service-mandatory.yml
+5
-0
lib/gitlab/shell.rb
lib/gitlab/shell.rb
+4
-40
spec/features/admin/admin_uses_repository_checks_spec.rb
spec/features/admin/admin_uses_repository_checks_spec.rb
+1
-1
spec/features/issues/user_uses_slash_commands_spec.rb
spec/features/issues/user_uses_slash_commands_spec.rb
+3
-1
spec/javascripts/sidebar/sidebar_subscriptions_spec.js
spec/javascripts/sidebar/sidebar_subscriptions_spec.js
+2
-1
spec/javascripts/sidebar/subscriptions_spec.js
spec/javascripts/sidebar/subscriptions_spec.js
+0
-8
spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js
...pts/vue_mr_widget/components/states/mr_widget_wip_spec.js
+4
-4
spec/services/merge_requests/merge_service_spec.rb
spec/services/merge_requests/merge_service_spec.rb
+2
-2
No files found.
app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
View file @
15bb2f91
<
script
>
<
script
>
import
Store
from
'
../../stores/sidebar_store
'
;
import
Store
from
'
../../stores/sidebar_store
'
;
import
eventHub
from
'
../../event_hub
'
;
import
Flash
from
'
../../../flash
'
;
import
Flash
from
'
../../../flash
'
;
import
{
__
}
from
'
../../../locale
'
;
import
{
__
}
from
'
../../../locale
'
;
import
subscriptions
from
'
./subscriptions.vue
'
;
import
subscriptions
from
'
./subscriptions.vue
'
;
...
@@ -19,6 +20,12 @@ export default {
...
@@ -19,6 +20,12 @@ export default {
store
:
new
Store
(),
store
:
new
Store
(),
};
};
},
},
created
()
{
eventHub
.
$on
(
'
toggleSubscription
'
,
this
.
onToggleSubscription
);
},
beforeDestroy
()
{
eventHub
.
$off
(
'
toggleSubscription
'
,
this
.
onToggleSubscription
);
},
methods
:
{
methods
:
{
onToggleSubscription
()
{
onToggleSubscription
()
{
this
.
mediator
.
toggleSubscription
()
this
.
mediator
.
toggleSubscription
()
...
@@ -35,7 +42,6 @@ export default {
...
@@ -35,7 +42,6 @@ export default {
<subscriptions
<subscriptions
:loading=
"store.isFetching.subscriptions"
:loading=
"store.isFetching.subscriptions"
:subscribed=
"store.subscribed"
:subscribed=
"store.subscribed"
@
toggleSubscription=
"onToggleSubscription"
/>
/>
</div>
</div>
</
template
>
</
template
>
app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
View file @
15bb2f91
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
import
icon
from
'
~/vue_shared/components/icon.vue
'
;
import
icon
from
'
~/vue_shared/components/icon.vue
'
;
import
toggleButton
from
'
~/vue_shared/components/toggle_button.vue
'
;
import
toggleButton
from
'
~/vue_shared/components/toggle_button.vue
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
eventHub
from
'
../../event_hub
'
;
const
ICON_ON
=
'
notifications
'
;
const
ICON_ON
=
'
notifications
'
;
const
ICON_OFF
=
'
notifications-off
'
;
const
ICON_OFF
=
'
notifications-off
'
;
...
@@ -47,7 +48,7 @@
...
@@ -47,7 +48,7 @@
},
},
methods
:
{
methods
:
{
toggleSubscription
()
{
toggleSubscription
()
{
this
.
$emit
(
'
toggleSubscription
'
,
this
.
id
);
eventHub
.
$emit
(
'
toggleSubscription
'
,
this
.
id
);
},
},
},
},
};
};
...
...
app/assets/javascripts/sidebar/components/time_tracking/no_tracking_pane.js
deleted
100644 → 0
View file @
d03cd7b4
export
default
{
name
:
'
time-tracking-no-tracking-pane
'
,
template
:
`
<div class="time-tracking-no-tracking-pane">
<span class="no-value">
{{ __('No estimate or time spent') }}
</span>
</div>
`
,
};
app/assets/javascripts/sidebar/components/time_tracking/no_tracking_pane.vue
0 → 100644
View file @
15bb2f91
<
script
>
export
default
{
name
:
'
TimeTrackingNoTrackingPane
'
,
};
</
script
>
<
template
>
<div
class=
"time-tracking-no-tracking-pane"
>
<span
class=
"no-value"
>
{{
__
(
'
No estimate or time spent
'
)
}}
</span>
</div>
</
template
>
app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.
js
→
app/assets/javascripts/sidebar/components/time_tracking/sidebar_time_tracking.
vue
View file @
15bb2f91
<
script
>
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
...
@@ -10,14 +11,17 @@ import Mediator from '../../sidebar_mediator';
...
@@ -10,14 +11,17 @@ import Mediator from '../../sidebar_mediator';
import
eventHub
from
'
../../event_hub
'
;
import
eventHub
from
'
../../event_hub
'
;
export
default
{
export
default
{
components
:
{
IssuableTimeTracker
,
},
data
()
{
data
()
{
return
{
return
{
mediator
:
new
Mediator
(),
mediator
:
new
Mediator
(),
store
:
new
Store
(),
store
:
new
Store
(),
};
};
},
},
components
:
{
mounted
()
{
IssuableTimeTracker
,
this
.
listenForQuickActions
();
},
},
methods
:
{
methods
:
{
listenForQuickActions
()
{
listenForQuickActions
()
{
...
@@ -41,18 +45,17 @@ export default {
...
@@ -41,18 +45,17 @@ export default {
}
}
},
},
},
},
mounted
()
{
this
.
listenForQuickActions
();
},
template
:
`
<div class="block">
<issuable-time-tracker
:time_estimate="store.timeEstimate"
:time_spent="store.totalTimeSpent"
:human_time_estimate="store.humanTimeEstimate"
:human_time_spent="store.humanTotalTimeSpent"
:rootPath="store.rootPath"
/>
</div>
`
,
};
};
</
script
>
<
template
>
<div
class=
"block"
>
<issuable-time-tracker
:time_estimate=
"store.timeEstimate"
:time_spent=
"store.totalTimeSpent"
:human_time_estimate=
"store.humanTimeEstimate"
:human_time_spent=
"store.humanTotalTimeSpent"
:root-path=
"store.rootPath"
/>
</div>
</
template
>
app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
View file @
15bb2f91
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
import
TimeTrackingHelpState
from
'
./help_state.vue
'
;
import
TimeTrackingHelpState
from
'
./help_state.vue
'
;
import
TimeTrackingCollapsedState
from
'
./collapsed_state.vue
'
;
import
TimeTrackingCollapsedState
from
'
./collapsed_state.vue
'
;
import
timeTrackingSpentOnlyPane
from
'
./spent_only_pane
'
;
import
timeTrackingSpentOnlyPane
from
'
./spent_only_pane
'
;
import
timeTrackingNoTrackingPane
from
'
./no_tracking_pan
e
'
;
import
TimeTrackingNoTrackingPane
from
'
./no_tracking_pane.vu
e
'
;
import
TimeTrackingEstimateOnlyPane
from
'
./estimate_only_pane.vue
'
;
import
TimeTrackingEstimateOnlyPane
from
'
./estimate_only_pane.vue
'
;
import
TimeTrackingComparisonPane
from
'
./comparison_pane.vue
'
;
import
TimeTrackingComparisonPane
from
'
./comparison_pane.vue
'
;
...
@@ -14,7 +14,7 @@ export default {
...
@@ -14,7 +14,7 @@ export default {
TimeTrackingCollapsedState
,
TimeTrackingCollapsedState
,
TimeTrackingEstimateOnlyPane
,
TimeTrackingEstimateOnlyPane
,
'
time-tracking-spent-only-pane
'
:
timeTrackingSpentOnlyPane
,
'
time-tracking-spent-only-pane
'
:
timeTrackingSpentOnlyPane
,
'
time-tracking-no-tracking-pane
'
:
t
imeTrackingNoTrackingPane
,
T
imeTrackingNoTrackingPane
,
TimeTrackingComparisonPane
,
TimeTrackingComparisonPane
,
TimeTrackingHelpState
,
TimeTrackingHelpState
,
},
},
...
...
app/assets/javascripts/sidebar/mount_sidebar.js
View file @
15bb2f91
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
SidebarTimeTracking
from
'
./components/time_tracking/sidebar_time_tracking
'
;
import
SidebarTimeTracking
from
'
./components/time_tracking/sidebar_time_tracking
.vue
'
;
import
SidebarAssignees
from
'
./components/assignees/sidebar_assignees.vue
'
;
import
SidebarAssignees
from
'
./components/assignees/sidebar_assignees.vue
'
;
import
ConfidentialIssueSidebar
from
'
./components/confidential/confidential_issue_sidebar.vue
'
;
import
ConfidentialIssueSidebar
from
'
./components/confidential/confidential_issue_sidebar.vue
'
;
import
SidebarMoveIssue
from
'
./lib/sidebar_move_issue
'
;
import
SidebarMoveIssue
from
'
./lib/sidebar_move_issue
'
;
...
...
app/assets/javascripts/vue_merge_request_widget/components/states/
mr_widget_wip.js
→
app/assets/javascripts/vue_merge_request_widget/components/states/
work_in_progress.vue
View file @
15bb2f91
<
script
>
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
statusIcon
from
'
../mr_widget_status_icon.vue
'
;
import
statusIcon
from
'
../mr_widget_status_icon.vue
'
;
import
tooltip
from
'
../../../vue_shared/directives/tooltip
'
;
import
tooltip
from
'
../../../vue_shared/directives/tooltip
'
;
import
eventHub
from
'
../../event_hub
'
;
import
eventHub
from
'
../../event_hub
'
;
export
default
{
export
default
{
name
:
'
MRWidgetWIP
'
,
name
:
'
WorkInProgress
'
,
props
:
{
components
:
{
mr
:
{
type
:
Object
,
required
:
true
},
statusIcon
,
service
:
{
type
:
Object
,
required
:
true
},
},
},
directives
:
{
directives
:
{
tooltip
,
tooltip
,
},
},
props
:
{
mr
:
{
type
:
Object
,
required
:
true
},
service
:
{
type
:
Object
,
required
:
true
},
},
data
()
{
data
()
{
return
{
return
{
isMakingRequest
:
false
,
isMakingRequest
:
false
,
};
};
},
},
components
:
{
statusIcon
,
},
methods
:
{
methods
:
{
removeWIP
()
{
removeWIP
()
{
this
.
isMakingRequest
=
true
;
this
.
isMakingRequest
=
true
;
...
@@ -36,32 +37,40 @@ export default {
...
@@ -36,32 +37,40 @@ export default {
});
});
},
},
},
},
template
:
`
<div class="mr-widget-body media">
<status-icon status="warning" :show-disabled-button="Boolean(mr.removeWIPPath)" />
<div class="media-body space-children">
<span class="bold">
This is a Work in Progress
<i
v-tooltip
class="fa fa-question-circle"
title="When this merge request is ready, remove the WIP: prefix from the title to allow it to be merged"
aria-label="When this merge request is ready, remove the WIP: prefix from the title to allow it to be merged">
</i>
</span>
<button
v-if="mr.removeWIPPath"
@click="removeWIP"
:disabled="isMakingRequest"
type="button"
class="btn btn-default btn-xs js-remove-wip">
<i
v-if="isMakingRequest"
class="fa fa-spinner fa-spin"
aria-hidden="true" />
Resolve WIP status
</button>
</div>
</div>
`
,
};
};
</
script
>
<
template
>
<div
class=
"mr-widget-body media"
>
<status-icon
status=
"warning"
:show-disabled-button=
"Boolean(mr.removeWIPPath)"
/>
<div
class=
"media-body space-children"
>
<span
class=
"bold"
>
This is a Work in Progress
<i
v-tooltip
class=
"fa fa-question-circle"
title=
"When this merge request is ready,
remove the WIP: prefix from the title to allow it to be merged"
aria-label=
"When this merge request is ready,
remove the WIP: prefix from the title to allow it to be merged"
>
</i>
</span>
<button
v-if=
"mr.removeWIPPath"
@
click=
"removeWIP"
:disabled=
"isMakingRequest"
type=
"button"
class=
"btn btn-default btn-xs js-remove-wip"
>
<i
v-if=
"isMakingRequest"
class=
"fa fa-spinner fa-spin"
aria-hidden=
"true"
>
</i>
Resolve WIP status
</button>
</div>
</div>
</
template
>
app/assets/javascripts/vue_merge_request_widget/dependencies.js
View file @
15bb2f91
...
@@ -21,7 +21,7 @@ export { default as MergedState } from './components/states/mr_widget_merged.vue
...
@@ -21,7 +21,7 @@ export { default as MergedState } from './components/states/mr_widget_merged.vue
export
{
default
as
FailedToMerge
}
from
'
./components/states/mr_widget_failed_to_merge.vue
'
;
export
{
default
as
FailedToMerge
}
from
'
./components/states/mr_widget_failed_to_merge.vue
'
;
export
{
default
as
ClosedState
}
from
'
./components/states/mr_widget_closed.vue
'
;
export
{
default
as
ClosedState
}
from
'
./components/states/mr_widget_closed.vue
'
;
export
{
default
as
MergingState
}
from
'
./components/states/mr_widget_merging.vue
'
;
export
{
default
as
MergingState
}
from
'
./components/states/mr_widget_merging.vue
'
;
export
{
default
as
W
ipState
}
from
'
./components/states/mr_widget_wip
'
;
export
{
default
as
W
orkInProgressState
}
from
'
./components/states/work_in_progress.vue
'
;
export
{
default
as
ArchivedState
}
from
'
./components/states/mr_widget_archived.vue
'
;
export
{
default
as
ArchivedState
}
from
'
./components/states/mr_widget_archived.vue
'
;
export
{
default
as
ConflictsState
}
from
'
./components/states/mr_widget_conflicts.vue
'
;
export
{
default
as
ConflictsState
}
from
'
./components/states/mr_widget_conflicts.vue
'
;
export
{
default
as
NothingToMergeState
}
from
'
./components/states/nothing_to_merge.vue
'
;
export
{
default
as
NothingToMergeState
}
from
'
./components/states/nothing_to_merge.vue
'
;
...
...
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
View file @
15bb2f91
...
@@ -12,7 +12,7 @@ import {
...
@@ -12,7 +12,7 @@ import {
ClosedState
,
ClosedState
,
MergingState
,
MergingState
,
RebaseState
,
RebaseState
,
W
ip
State
,
W
orkInProgress
State
,
ArchivedState
,
ArchivedState
,
ConflictsState
,
ConflictsState
,
NothingToMergeState
,
NothingToMergeState
,
...
@@ -220,7 +220,7 @@ export default {
...
@@ -220,7 +220,7 @@ export default {
'
mr-widget-closed
'
:
ClosedState
,
'
mr-widget-closed
'
:
ClosedState
,
'
mr-widget-merging
'
:
MergingState
,
'
mr-widget-merging
'
:
MergingState
,
'
mr-widget-failed-to-merge
'
:
FailedToMerge
,
'
mr-widget-failed-to-merge
'
:
FailedToMerge
,
'
mr-widget-wip
'
:
W
ip
State
,
'
mr-widget-wip
'
:
W
orkInProgress
State
,
'
mr-widget-archived
'
:
ArchivedState
,
'
mr-widget-archived
'
:
ArchivedState
,
'
mr-widget-conflicts
'
:
ConflictsState
,
'
mr-widget-conflicts
'
:
ConflictsState
,
'
mr-widget-nothing-to-merge
'
:
NothingToMergeState
,
'
mr-widget-nothing-to-merge
'
:
NothingToMergeState
,
...
...
app/assets/stylesheets/framework/blocks.scss
View file @
15bb2f91
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
}
}
&
.middle-block
{
&
.middle-block
{
margin-top
:
0
;
margin-top
:
$gl-padding-24
;
margin-bottom
:
0
;
margin-bottom
:
0
;
}
}
...
@@ -61,7 +61,7 @@
...
@@ -61,7 +61,7 @@
}
}
&
.footer-block
{
&
.footer-block
{
margin-top
:
0
;
margin-top
:
$gl-padding-24
;
border-bottom
:
0
;
border-bottom
:
0
;
margin-bottom
:
-
$gl-padding
;
margin-bottom
:
-
$gl-padding
;
}
}
...
...
app/assets/stylesheets/framework/variables.scss
View file @
15bb2f91
...
@@ -212,6 +212,7 @@ $tooltip-font-size: 12px;
...
@@ -212,6 +212,7 @@ $tooltip-font-size: 12px;
/*
/*
* Padding
* Padding
*/
*/
$gl-padding-24
:
24px
;
$gl-padding
:
16px
;
$gl-padding
:
16px
;
$gl-padding-8
:
8px
;
$gl-padding-8
:
8px
;
$gl-padding-4
:
4px
;
$gl-padding-4
:
4px
;
...
...
app/services/merge_requests/merge_service.rb
View file @
15bb2f91
...
@@ -50,21 +50,30 @@ module MergeRequests
...
@@ -50,21 +50,30 @@ module MergeRequests
end
end
def
commit
def
commit
message
=
params
[
:commit_message
]
||
merge_request
.
merge_commit_message
log_info
(
"Git merge started on JID
#{
merge_jid
}
"
)
log_info
(
"Git merge started on JID
#{
merge_jid
}
"
)
commit_id
=
repository
.
merge
(
current_user
,
source
,
merge_request
,
message
)
commit_id
=
try_merge
log_info
(
"Git merge finished on JID
#{
merge_jid
}
commit
#{
commit_id
}
"
)
if
commit_id
log_info
(
"Git merge finished on JID
#{
merge_jid
}
commit
#{
commit_id
}
"
)
else
raise
MergeError
,
'Conflicts detected during merge'
end
raise
MergeError
,
'Conflicts detected during merge'
unless
commit_id
merge_request
.
update!
(
merge_commit_sha:
commit_id
)
end
def
try_merge
message
=
params
[
:commit_message
]
||
merge_request
.
merge_commit_message
merge_request
.
update
(
merge_commit_sha:
commit_id
)
repository
.
merge
(
current_user
,
source
,
merge_request
,
message
)
rescue
Gitlab
::
Git
::
HooksService
::
PreReceiveError
=>
e
rescue
Gitlab
::
Git
::
HooksService
::
PreReceiveError
=>
e
raise
MergeError
,
e
.
message
handle_merge_error
(
log_message:
e
.
message
)
rescue
StandardError
=>
e
raise
MergeError
,
'Something went wrong during merge pre-receive hook'
raise
MergeError
,
"Something went wrong during merge:
#{
e
.
message
}
"
rescue
=>
e
handle_merge_error
(
log_message:
e
.
message
)
raise
MergeError
,
'Something went wrong during merge'
ensure
ensure
merge_request
.
update
(
in_progress_merge_commit_sha:
nil
)
merge_request
.
update
!
(
in_progress_merge_commit_sha:
nil
)
end
end
def
after_merge
def
after_merge
...
...
app/views/admin/projects/show.html.haml
View file @
15bb2f91
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
.panel
.panel
.panel-heading.alert.alert-danger
.panel-heading.alert.alert-danger
Last repository check
Last repository check
=
"(
#{
time_ago_
in_words
(
@project
.
last_repository_check_at
)
}
ago
)"
=
"(
#{
time_ago_
with_tooltip
(
@project
.
last_repository_check_at
)
}
)"
failed. See
failed. See
=
link_to
'repocheck.log'
,
admin_logs_path
=
link_to
'repocheck.log'
,
admin_logs_path
for error messages.
for error messages.
...
...
app/views/admin/runners/_runner.html.haml
View file @
15bb2f91
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
=
tag
=
tag
%td
%td
-
if
runner
.
contacted_at
-
if
runner
.
contacted_at
#{
time_ago_in_words
(
runner
.
contacted_at
)
}
ago
=
time_ago_with_tooltip
runner
.
contacted_at
-
else
-
else
Never
Never
%td
.admin-runner-btn-group-cell
%td
.admin-runner-btn-group-cell
...
...
app/views/admin/runners/show.html.haml
View file @
15bb2f91
...
@@ -108,4 +108,4 @@
...
@@ -108,4 +108,4 @@
%td
.timestamp
%td
.timestamp
-
if
build
.
finished_at
-
if
build
.
finished_at
%span
#{
time_ago_in_words
build
.
finished_at
}
ago
%span
=
time_ago_with_tooltip
build
.
finished_at
app/views/admin/services/index.html.haml
View file @
15bb2f91
...
@@ -20,5 +20,4 @@
...
@@ -20,5 +20,4 @@
%td
%td
=
service
.
description
=
service
.
description
%td
.light
%td
.light
=
time_ago_in_words
service
.
updated_at
=
time_ago_with_tooltip
service
.
updated_at
ago
app/views/devise/mailer/unlock_instructions.html.haml
View file @
15bb2f91
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
=
email_default_heading
(
"Hello,
#{
@resource
.
name
}
!"
)
=
email_default_heading
(
"Hello,
#{
@resource
.
name
}
!"
)
%p
%p
Your GitLab account has been locked due to an excessive amount of unsuccessful
Your GitLab account has been locked due to an excessive amount of unsuccessful
sign in attempts. Your account will automatically unlock in
#{
time_ago_in_words
(
Devise
.
unlock_in
.
from_now
)
}
sign in attempts. Your account will automatically unlock in
#{
distance_of_time_in_words
(
Devise
.
unlock_in
)
}
or you may click the link below to unlock now.
or you may click the link below to unlock now.
#cta
#cta
=
link_to
(
'Unlock account'
,
unlock_url
(
@resource
,
unlock_token:
@token
))
=
link_to
(
'Unlock account'
,
unlock_url
(
@resource
,
unlock_token:
@token
))
app/views/devise/mailer/unlock_instructions.text.erb
View file @
15bb2f91
Hello,
<%=
@resource
.
name
%>
!
Hello,
<%=
@resource
.
name
%>
!
Your GitLab account has been locked due to an excessive amount of unsuccessful
Your GitLab account has been locked due to an excessive amount of unsuccessful
sign in attempts. Your account will automatically unlock in
<%=
time_ago_in_words
(
Devise
.
unlock_in
.
from_now
)
%>
sign in attempts. Your account will automatically unlock in
<%=
distance_of_time_in_words
(
Devise
.
unlock_in
)
%>
or you may click the link below to unlock now.
or you may click the link below to unlock now.
<%=
unlock_url
(
@resource
,
unlock_token:
@token
)
%>
<%=
unlock_url
(
@resource
,
unlock_token:
@token
)
%>
app/views/projects/jobs/_sidebar.html.haml
View file @
15bb2f91
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
-
elsif
@build
.
has_expiring_artifacts?
-
elsif
@build
.
has_expiring_artifacts?
%p
.build-detail-row
%p
.build-detail-row
The artifacts will be removed in
The artifacts will be removed in
%span
=
time_ago_
in_words
@build
.
artifacts_expire_at
%span
=
time_ago_
with_tooltip
@build
.
artifacts_expire_at
-
if
@build
.
artifacts?
-
if
@build
.
artifacts?
.btn-group.btn-group-justified
{
role: :group
}
.btn-group.btn-group-justified
{
role: :group
}
...
...
app/views/projects/registry/repositories/_tag.html.haml
View file @
15bb2f91
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
\-
\-
%td
%td
-
if
tag
.
created_at
-
if
tag
.
created_at
=
time_ago_
in_words
(
tag
.
created_at
)
=
time_ago_
with_tooltip
tag
.
created_at
-
else
-
else
.light
.light
\-
\-
...
...
app/views/projects/runners/show.html.haml
View file @
15bb2f91
...
@@ -62,6 +62,6 @@
...
@@ -62,6 +62,6 @@
%td
Last contact
%td
Last contact
%td
%td
-
if
@runner
.
contacted_at
-
if
@runner
.
contacted_at
#{
time_ago_in_words
(
@runner
.
contacted_at
)
}
ago
=
time_ago_with_tooltip
@runner
.
contacted_at
-
else
-
else
Never
Never
app/views/projects/services/_index.html.haml
View file @
15bb2f91
...
@@ -27,5 +27,4 @@
...
@@ -27,5 +27,4 @@
=
service
.
description
=
service
.
description
%td
.light
%td
.light
-
if
service
.
updated_at
.
present?
-
if
service
.
updated_at
.
present?
=
time_ago_in_words
service
.
updated_at
=
time_ago_with_tooltip
service
.
updated_at
ago
app/views/projects/triggers/_trigger.html.haml
View file @
15bb2f91
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
%td
%td
-
if
trigger
.
last_used
-
if
trigger
.
last_used
#{
time_ago_in_words
(
trigger
.
last_used
)
}
ago
=
time_ago_with_tooltip
trigger
.
last_used
-
else
-
else
Never
Never
...
...
app/views/sherlock/transactions/_general.html.haml
View file @
15bb2f91
...
@@ -35,5 +35,4 @@
...
@@ -35,5 +35,4 @@
%span
.light
%span
.light
#{
t
(
'sherlock.finished_at'
)
}
:
#{
t
(
'sherlock.finished_at'
)
}
:
%strong
%strong
=
time_ago_in_words
(
@transaction
.
finished_at
)
=
time_ago_with_tooltip
@transaction
.
finished_at
=
t
(
'sherlock.ago'
)
app/views/sherlock/transactions/index.html.haml
View file @
15bb2f91
...
@@ -35,8 +35,7 @@
...
@@ -35,8 +35,7 @@
=
t
(
'sherlock.seconds'
)
=
t
(
'sherlock.seconds'
)
%td
=
trans
.
queries
.
length
%td
=
trans
.
queries
.
length
%td
%td
=
time_ago_in_words
(
trans
.
finished_at
)
=
time_ago_with_tooltip
trans
.
finished_at
=
t
(
'sherlock.ago'
)
%td
%td
=
link_to
(
sherlock_transaction_path
(
trans
),
class:
'btn btn-xs'
)
do
=
link_to
(
sherlock_transaction_path
(
trans
),
class:
'btn btn-xs'
)
do
=
t
(
'sherlock.view'
)
=
t
(
'sherlock.view'
)
changelogs/unreleased/45761-replace-actionview-time_ago_in_words.yml
0 → 100644
View file @
15bb2f91
---
title
:
Replace time_ago_in_words with JS-based one
merge_request
:
18607
author
:
Takuya Noguchi
type
:
performance
changelogs/unreleased/increase-new-issue-metadata-form-margin.yml
0 → 100644
View file @
15bb2f91
---
title
:
Increase new issue metadata form margin
merge_request
:
18630
author
:
George Tsiolis
type
:
fixed
changelogs/unreleased/jprovazn-generic-error.yml
0 → 100644
View file @
15bb2f91
---
title
:
Display only generic message on merge error to avoid exposing any potentially
sensitive or user unfriendly backend messages.
merge_request
:
author
:
type
:
fixed
changelogs/unreleased/refactor-move-mr-widget-wip-vue-component.yml
0 → 100644
View file @
15bb2f91
---
title
:
Move WorkInProgress vue component
merge_request
:
17536
author
:
George Tsiolis
type
:
performance
changelogs/unreleased/refactor-move-no-tracking-pane-vue-component.yml
0 → 100644
View file @
15bb2f91
---
title
:
Move TimeTrackingNoTrackingPane vue component
merge_request
:
18676
author
:
George Tsiolis
type
:
performance
changelogs/unreleased/refactor-move-sidebar-time-tracking-vue-component.yml
0 → 100644
View file @
15bb2f91
---
title
:
Move SidebarTimeTracking vue component
merge_request
:
18677
author
:
George Tsiolis
type
:
performance
changelogs/unreleased/zj-namespace-service-mandatory.yml
0 → 100644
View file @
15bb2f91
---
title
:
Finish NamespaceService migration to Gitaly
merge_request
:
author
:
type
:
performance
lib/gitlab/shell.rb
View file @
15bb2f91
...
@@ -294,17 +294,7 @@ module Gitlab
...
@@ -294,17 +294,7 @@ module Gitlab
# add_namespace("default", "gitlab")
# add_namespace("default", "gitlab")
#
#
def
add_namespace
(
storage
,
name
)
def
add_namespace
(
storage
,
name
)
Gitlab
::
GitalyClient
.
migrate
(
:add_namespace
,
Gitlab
::
GitalyClient
::
NamespaceService
.
new
(
storage
).
add
(
name
)
status:
Gitlab
::
GitalyClient
::
MigrationStatus
::
OPT_OUT
)
do
|
enabled
|
if
enabled
Gitlab
::
GitalyClient
::
NamespaceService
.
new
(
storage
).
add
(
name
)
else
path
=
full_path
(
storage
,
name
)
FileUtils
.
mkdir_p
(
path
,
mode:
0770
)
unless
exists?
(
storage
,
name
)
end
end
rescue
Errno
::
EEXIST
=>
e
Rails
.
logger
.
warn
(
"Directory exists as a file:
#{
e
}
at:
#{
path
}
"
)
rescue
GRPC
::
InvalidArgument
=>
e
rescue
GRPC
::
InvalidArgument
=>
e
raise
ArgumentError
,
e
.
message
raise
ArgumentError
,
e
.
message
end
end
...
@@ -316,14 +306,7 @@ module Gitlab
...
@@ -316,14 +306,7 @@ module Gitlab
# rm_namespace("default", "gitlab")
# rm_namespace("default", "gitlab")
#
#
def
rm_namespace
(
storage
,
name
)
def
rm_namespace
(
storage
,
name
)
Gitlab
::
GitalyClient
.
migrate
(
:remove_namespace
,
Gitlab
::
GitalyClient
::
NamespaceService
.
new
(
storage
).
remove
(
name
)
status:
Gitlab
::
GitalyClient
::
MigrationStatus
::
OPT_OUT
)
do
|
enabled
|
if
enabled
Gitlab
::
GitalyClient
::
NamespaceService
.
new
(
storage
).
remove
(
name
)
else
FileUtils
.
rm_r
(
full_path
(
storage
,
name
),
force:
true
)
end
end
rescue
GRPC
::
InvalidArgument
=>
e
rescue
GRPC
::
InvalidArgument
=>
e
raise
ArgumentError
,
e
.
message
raise
ArgumentError
,
e
.
message
end
end
...
@@ -335,17 +318,7 @@ module Gitlab
...
@@ -335,17 +318,7 @@ module Gitlab
# mv_namespace("/path/to/storage", "gitlab", "gitlabhq")
# mv_namespace("/path/to/storage", "gitlab", "gitlabhq")
#
#
def
mv_namespace
(
storage
,
old_name
,
new_name
)
def
mv_namespace
(
storage
,
old_name
,
new_name
)
Gitlab
::
GitalyClient
.
migrate
(
:rename_namespace
,
Gitlab
::
GitalyClient
::
NamespaceService
.
new
(
storage
).
rename
(
old_name
,
new_name
)
status:
Gitlab
::
GitalyClient
::
MigrationStatus
::
OPT_OUT
)
do
|
enabled
|
if
enabled
Gitlab
::
GitalyClient
::
NamespaceService
.
new
(
storage
)
.
rename
(
old_name
,
new_name
)
else
break
false
if
exists?
(
storage
,
new_name
)
||
!
exists?
(
storage
,
old_name
)
FileUtils
.
mv
(
full_path
(
storage
,
old_name
),
full_path
(
storage
,
new_name
))
end
end
rescue
GRPC
::
InvalidArgument
rescue
GRPC
::
InvalidArgument
false
false
end
end
...
@@ -370,17 +343,8 @@ module Gitlab
...
@@ -370,17 +343,8 @@ module Gitlab
# exists?(storage, 'gitlab')
# exists?(storage, 'gitlab')
# exists?(storage, 'gitlab/cookies.git')
# exists?(storage, 'gitlab/cookies.git')
#
#
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/385
def
exists?
(
storage
,
dir_name
)
def
exists?
(
storage
,
dir_name
)
Gitlab
::
GitalyClient
.
migrate
(
:namespace_exists
,
Gitlab
::
GitalyClient
::
NamespaceService
.
new
(
storage
).
exists?
(
dir_name
)
status:
Gitlab
::
GitalyClient
::
MigrationStatus
::
OPT_OUT
)
do
|
enabled
|
if
enabled
Gitlab
::
GitalyClient
::
NamespaceService
.
new
(
storage
)
.
exists?
(
dir_name
)
else
File
.
exist?
(
full_path
(
storage
,
dir_name
))
end
end
end
end
protected
protected
...
...
spec/features/admin/admin_uses_repository_checks_spec.rb
View file @
15bb2f91
...
@@ -19,7 +19,7 @@ feature 'Admin uses repository checks' do
...
@@ -19,7 +19,7 @@ feature 'Admin uses repository checks' do
expect
(
page
).
to
have_content
(
'Repository check was triggered'
)
expect
(
page
).
to
have_content
(
'Repository check was triggered'
)
end
end
scenario
'to see a single failed repository check'
do
scenario
'to see a single failed repository check'
,
:js
do
project
=
create
(
:project
)
project
=
create
(
:project
)
project
.
update_columns
(
project
.
update_columns
(
last_repository_check_failed:
true
,
last_repository_check_failed:
true
,
...
...
spec/features/issues/user_uses_slash_commands_spec.rb
View file @
15bb2f91
...
@@ -178,9 +178,10 @@ feature 'Issues > User uses quick actions', :js do
...
@@ -178,9 +178,10 @@ feature 'Issues > User uses quick actions', :js do
end
end
context
'when the project is valid but the user not authorized'
do
context
'when the project is valid but the user not authorized'
do
let
(
:project_unauthorized
)
{
create
(
:project
,
:public
)
}
let
(
:project_unauthorized
)
{
create
(
:project
,
:public
)
}
before
do
before
do
gitlab_sign_out
sign_in
(
user
)
sign_in
(
user
)
visit
project_issue_path
(
project
,
issue
)
visit
project_issue_path
(
project
,
issue
)
end
end
...
@@ -195,6 +196,7 @@ feature 'Issues > User uses quick actions', :js do
...
@@ -195,6 +196,7 @@ feature 'Issues > User uses quick actions', :js do
context
'when the project is invalid'
do
context
'when the project is invalid'
do
before
do
before
do
gitlab_sign_out
sign_in
(
user
)
sign_in
(
user
)
visit
project_issue_path
(
project
,
issue
)
visit
project_issue_path
(
project
,
issue
)
end
end
...
...
spec/javascripts/sidebar/sidebar_subscriptions_spec.js
View file @
15bb2f91
...
@@ -3,6 +3,7 @@ import sidebarSubscriptions from '~/sidebar/components/subscriptions/sidebar_sub
...
@@ -3,6 +3,7 @@ import sidebarSubscriptions from '~/sidebar/components/subscriptions/sidebar_sub
import
SidebarMediator
from
'
~/sidebar/sidebar_mediator
'
;
import
SidebarMediator
from
'
~/sidebar/sidebar_mediator
'
;
import
SidebarService
from
'
~/sidebar/services/sidebar_service
'
;
import
SidebarService
from
'
~/sidebar/services/sidebar_service
'
;
import
SidebarStore
from
'
~/sidebar/stores/sidebar_store
'
;
import
SidebarStore
from
'
~/sidebar/stores/sidebar_store
'
;
import
eventHub
from
'
~/sidebar/event_hub
'
;
import
mountComponent
from
'
spec/helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
spec/helpers/vue_mount_component_helper
'
;
import
Mock
from
'
./mock_data
'
;
import
Mock
from
'
./mock_data
'
;
...
@@ -31,7 +32,7 @@ describe('Sidebar Subscriptions', function () {
...
@@ -31,7 +32,7 @@ describe('Sidebar Subscriptions', function () {
mediator
,
mediator
,
});
});
vm
.
onToggleSubscription
(
);
eventHub
.
$emit
(
'
toggleSubscription
'
);
expect
(
mediator
.
toggleSubscription
).
toHaveBeenCalled
();
expect
(
mediator
.
toggleSubscription
).
toHaveBeenCalled
();
});
});
...
...
spec/javascripts/sidebar/subscriptions_spec.js
View file @
15bb2f91
...
@@ -39,12 +39,4 @@ describe('Subscriptions', function () {
...
@@ -39,12 +39,4 @@ describe('Subscriptions', function () {
expect
(
vm
.
$refs
.
toggleButton
.
$el
.
querySelector
(
'
.project-feature-toggle
'
)).
toHaveClass
(
'
is-checked
'
);
expect
(
vm
.
$refs
.
toggleButton
.
$el
.
querySelector
(
'
.project-feature-toggle
'
)).
toHaveClass
(
'
is-checked
'
);
});
});
it
(
'
toggleSubscription method emits `toggleSubscription` event on component
'
,
()
=>
{
vm
=
mountComponent
(
Subscriptions
,
{
subscribed
:
true
});
spyOn
(
vm
,
'
$emit
'
);
vm
.
toggleSubscription
();
expect
(
vm
.
$emit
).
toHaveBeenCalledWith
(
'
toggleSubscription
'
,
jasmine
.
any
(
Object
));
});
});
});
spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js
View file @
15bb2f91
import
Vue
from
'
vue
'
;
import
Vue
from
'
vue
'
;
import
wipComponent
from
'
~/vue_merge_request_widget/components/states/mr_widget_wip
'
;
import
WorkInProgress
from
'
~/vue_merge_request_widget/components/states/work_in_progress.vue
'
;
import
eventHub
from
'
~/vue_merge_request_widget/event_hub
'
;
import
eventHub
from
'
~/vue_merge_request_widget/event_hub
'
;
const
createComponent
=
()
=>
{
const
createComponent
=
()
=>
{
const
Component
=
Vue
.
extend
(
wipComponent
);
const
Component
=
Vue
.
extend
(
WorkInProgress
);
const
mr
=
{
const
mr
=
{
title
:
'
The best MR ever
'
,
title
:
'
The best MR ever
'
,
removeWIPPath
:
'
/path/to/remove/wip
'
,
removeWIPPath
:
'
/path/to/remove/wip
'
,
...
@@ -17,10 +17,10 @@ const createComponent = () => {
...
@@ -17,10 +17,10 @@ const createComponent = () => {
});
});
};
};
describe
(
'
MRWidgetWIP
'
,
()
=>
{
describe
(
'
Wip
'
,
()
=>
{
describe
(
'
props
'
,
()
=>
{
describe
(
'
props
'
,
()
=>
{
it
(
'
should have props
'
,
()
=>
{
it
(
'
should have props
'
,
()
=>
{
const
{
mr
,
service
}
=
wipComponent
.
props
;
const
{
mr
,
service
}
=
WorkInProgress
.
props
;
expect
(
mr
.
type
instanceof
Object
).
toBeTruthy
();
expect
(
mr
.
type
instanceof
Object
).
toBeTruthy
();
expect
(
mr
.
required
).
toBeTruthy
();
expect
(
mr
.
required
).
toBeTruthy
();
...
...
spec/services/merge_requests/merge_service_spec.rb
View file @
15bb2f91
...
@@ -219,7 +219,7 @@ describe MergeRequests::MergeService do
...
@@ -219,7 +219,7 @@ describe MergeRequests::MergeService do
service
.
execute
(
merge_request
)
service
.
execute
(
merge_request
)
expect
(
merge_request
.
merge_error
).
to
include
(
error_message
)
expect
(
merge_request
.
merge_error
).
to
include
(
'Something went wrong during merge'
)
expect
(
Rails
.
logger
).
to
have_received
(
:error
).
with
(
a_string_matching
(
error_message
))
expect
(
Rails
.
logger
).
to
have_received
(
:error
).
with
(
a_string_matching
(
error_message
))
end
end
...
@@ -231,7 +231,7 @@ describe MergeRequests::MergeService do
...
@@ -231,7 +231,7 @@ describe MergeRequests::MergeService do
service
.
execute
(
merge_request
)
service
.
execute
(
merge_request
)
expect
(
merge_request
.
merge_error
).
to
include
(
error_message
)
expect
(
merge_request
.
merge_error
).
to
include
(
'Something went wrong during merge pre-receive hook'
)
expect
(
Rails
.
logger
).
to
have_received
(
:error
).
with
(
a_string_matching
(
error_message
))
expect
(
Rails
.
logger
).
to
have_received
(
:error
).
with
(
a_string_matching
(
error_message
))
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment