Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scheduling-system
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SMASCH
scheduling-system
Merge requests
!315
1.0.1 into master
Code
Review changes
Check out branch
Download
Patches
Plain diff
Closed
1.0.1 into master
devel_1.0.x
into
master
Overview
0
Commits
24
Pipelines
1
Changes
2
Closed
Piotr Gawron
requested to merge
devel_1.0.x
into
master
4 years ago
Overview
0
Commits
24
Pipelines
1
Changes
2
Expand
0
0
Merge request reports
Viewing commit
f89b3b53
Prev
Next
Show latest version
2 files
+
5
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
f89b3b53
Merge branch 'devel_1.0.x' into 388-problem-with-generating-documents
· f89b3b53
Piotr Gawron
authored
4 years ago
Conflict: This file was modified in both the source and target branches. Ask someone with write access to resolve it.
smash/web/templates/_base.html
+
1
−
1
Options
@@ -256,7 +256,7 @@ desired effect
{% block footer %}
<!-- To the right -->
<div
class=
"pull-right hidden-xs"
>
Version:
<strong>
1.0.
0
</strong>
Version:
<strong>
1.0.
1
</strong>
</div>
<!-- Default to the left -->
Loading
