diff --git a/.eslintignore b/.eslintignore
index d6ce39636bd..1623b996213 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -8,4 +8,4 @@
karma.config.js
webpack.config.js
svg.config.js
-/app/assets/javascripts/locale/**/*.js
+/app/assets/javascripts/locale/**/app.js
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed993abae73..8501911fde4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -404,6 +404,7 @@ docs lint:
before_script: []
script:
- scripts/lint-doc.sh
+ - scripts/lint-changelog-yaml
- mv doc/ /nanoc/content/
- cd /nanoc
# Build HTML from Markdown
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c671f8d53a..a31817e2b8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
documentation](doc/development/changelog.md) for instructions on adding your own
entry.
+## 10.0.2 (2017-09-27)
+
+- [FIXED] Notes will not show an empty bubble when the author isn't a member. !14450
+- [FIXED] Some checks in `rake gitlab:check` were failling with 'undefined method `run_command`'. !14469
+- [FIXED] Make locked setting of Runner to not affect jobs scheduling. !14483
+- [FIXED] Re-allow `name` attribute on user-provided anchor HTML.
+
## 10.0.1 (2017-09-23)
- [FIXED] Fix duplicate key errors in PostDeployMigrateUserExternalMailData migration.
@@ -78,6 +85,8 @@ entry.
- [FIXED] Fixed merge request changes bar jumping.
- [FIXED] Improve migrations using triggers.
- [FIXED] Fix ConvDev Index nav item and Monitoring submenu regression.
+- [FIXED] disabling notifications globally now properly turns off group/project added
+ emails !13325
- [DEPRECATED] Deprecate custom SSH client configuration for the git user. !13930
- [CHANGED] allow all users to delete their account. !13636 (Jacopo Beschi @jacopo-beschi)
- [CHANGED] Use full path of project's avatar in webhooks. !13649 (Vitaliy @blackst0ne Klachkov)
@@ -186,6 +195,13 @@ entry.
- Added type to CHANGELOG entries. (Jacopo Beschi @jacopo-beschi)
- [BUGIFX] Improves subgroup creation permissions. !13418
+## 9.5.6 (2017-09-29)
+
+- [FIXED] Fix MR ready to merge buttons/controls at mobile breakpoint. !14242
+- [FIXED] Fix errors thrown in merge request widget with external CI service/integration.
+- [FIXED] Update x/x discussions resolved checkmark icon to be green when all discussions resolved.
+- [FIXED] Fix 500 error on merged merge requests when GitLab is restored from a backup.
+
## 9.5.5 (2017-09-18)
- [SECURITY] Upgrade mail and nokogiri gems due to security issues. !13662 (Markus Koller)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dfb2ce0099a..6b261bd5938 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -49,7 +49,7 @@ _This notice should stay as the first item in the CONTRIBUTING.md file._
Thank you for your interest in contributing to GitLab. This guide details how
to contribute to GitLab in a way that is efficient for everyone.
-Looking for something to work on? Look for the label [Accepting Merge Requests](#i-want-to-contribute).
+Looking for something to work on? Look for issues with the label [Accepting Merge Requests](#i-want-to-contribute).
GitLab comes into two flavors, GitLab Community Edition (CE) our free and open
source edition, and GitLab Enterprise Edition (EE) which is our commercial
@@ -101,7 +101,7 @@ the remaining issues on the GitHub issue tracker.
## I want to contribute!
If you want to contribute to GitLab, but are not sure where to start,
-look for [issues with the label `Accepting Merge Requests` and weight < 5][accepting-mrs-weight].
+look for [issues with the label `Accepting Merge Requests` and small weight][accepting-mrs-weight].
These issues will be of reasonable size and challenge, for anyone to start
contributing to GitLab.
@@ -209,8 +209,7 @@ We add the ~"Accepting Merge Requests" label to:
- Low priority ~bug issues (i.e. we do not add it to the bugs that we want to
solve in the ~"Next Patch Release")
-- Small ~"feature proposal" that do not need ~UX / ~"Product work", or for which
-the ~UX / ~"Product work" is already done
+- Small ~"feature proposal"
- Small ~"technical debt" issues
After adding the ~"Accepting Merge Requests" label, we try to estimate the
@@ -223,6 +222,17 @@ know how difficult the issue is. Additionally:
- We encourage people that have never contributed to any open source project to
look for ["Accepting Merge Requests" issues with a weight of 1][firt-timers]
+If you've decided that you would like to work on an issue, please @-mention
+the [appropriate product manager](https://about.gitlab.com/handbook/product/#who-to-talk-to-for-what)
+as soon as possible. The product manager will then pull in appropriate GitLab team
+members to further discuss scope, design, and technical considerations. This will
+ensure that that your contribution is aligned with the GitLab product and minimize
+any rework and delay in getting it merged into master.
+
+GitLab team members who apply the ~"Accepting Merge Requests" label to an issue
+should update the issue description with a responsible product manager, inviting
+any potential community contributor to @-mention per above.
+
[up-for-grabs]: https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name=Accepting+Merge+Requests&scope=all&sort=weight_asc&state=opened
[firt-timers]: https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name%5B%5D=Accepting+Merge+Requests&scope=all&sort=upvotes_desc&state=opened&weight=1
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 9b0025a7850..8298bb08b2d 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-0.40.0
+0.43.0
diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION
index b3d91f9cfc0..5508e17c23b 100644
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
@@ -1 +1,2 @@
-5.9.0
+5.9.3
+
diff --git a/Gemfile b/Gemfile
index 460d9a05292..56cfaab09de 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@ gem 'doorkeeper', '~> 4.2.0'
gem 'doorkeeper-openid_connect', '~> 1.1.0'
gem 'omniauth', '~> 1.4.2'
gem 'omniauth-auth0', '~> 1.4.1'
-gem 'omniauth-azure-oauth2', '~> 0.0.6'
+gem 'omniauth-azure-oauth2', '~> 0.0.9'
gem 'omniauth-cas3', '~> 1.1.4'
gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-github', '~> 1.1.1'
@@ -398,7 +398,7 @@ group :ed25519 do
end
# Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.33.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.38.0', require: 'gitaly'
gem 'toml-rb', '~> 0.3.15', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index a13ab3e3305..fe54dd9d06c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -273,7 +273,7 @@ GEM
po_to_json (>= 1.0.0)
rails (>= 3.2.0)
gherkin-ruby (0.3.2)
- gitaly-proto (0.33.0)
+ gitaly-proto (0.38.0)
google-protobuf (~> 3.1)
grpc (~> 1.0)
github-linguist (4.7.6)
@@ -512,10 +512,10 @@ GEM
omniauth-oauth2 (~> 1.1)
omniauth-authentiq (0.3.1)
omniauth-oauth2 (~> 1.3, >= 1.3.1)
- omniauth-azure-oauth2 (0.0.6)
+ omniauth-azure-oauth2 (0.0.9)
jwt (~> 1.0)
omniauth (~> 1.0)
- omniauth-oauth2 (~> 1.1)
+ omniauth-oauth2 (~> 1.4)
omniauth-cas3 (1.1.4)
addressable (~> 2.3)
nokogiri (~> 1.7, >= 1.7.1)
@@ -541,7 +541,7 @@ GEM
omniauth-oauth (1.1.0)
oauth
omniauth (~> 1.0)
- omniauth-oauth2 (1.3.1)
+ omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
omniauth-oauth2-generic (0.2.2)
@@ -1027,7 +1027,7 @@ DEPENDENCIES
gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0)
- gitaly-proto (~> 0.33.0)
+ gitaly-proto (~> 0.38.0)
github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.6.2)
@@ -1077,7 +1077,7 @@ DEPENDENCIES
omniauth (~> 1.4.2)
omniauth-auth0 (~> 1.4.1)
omniauth-authentiq (~> 0.3.1)
- omniauth-azure-oauth2 (~> 0.0.6)
+ omniauth-azure-oauth2 (~> 0.0.9)
omniauth-cas3 (~> 1.1.4)
omniauth-facebook (~> 4.0.0)
omniauth-github (~> 1.1.1)
diff --git a/app/assets/images/favicon-blue.ico b/app/assets/images/favicon-blue.ico
old mode 100755
new mode 100644
diff --git a/app/assets/images/icons.json b/app/assets/images/icons.json
index e5da75faf38..6b8f85e37fd 100644
--- a/app/assets/images/icons.json
+++ b/app/assets/images/icons.json
@@ -1 +1 @@
-{"iconCount":134,"icons":["abuse","account","admin","angle-double-left","angle-down","angle-left","angle-right","angle-up","appearance","applications","approval","arrow-right","assignee","bold","book","branch","calendar","cancel","chevron-down","chevron-left","chevron-right","chevron-up","clock","code","comment-dots","comment-next","comment","comments","commit","credit-card","disk","doc_code","doc_image","doc_text","download","duplicate","earth","eye-slash","eye","file-additions","file-deletion","file-modified","filter","folder","fork","geo-nodes","git-merge","group","history","home","hook","issue-block","issue-child","issue-close","issue-duplicate","issue-new","issue-open-m","issue-open","issue-parent","issues","key-2","key","label","labels","leave","level-up","license","link","list-bulleted","list-numbered","location-dot","location","lock-open","lock","log","mail","merge-request-close-m","merge-request-close","messages","mobile-issue-close","monitor","more","notifications-off","notifications","overview","pencil","pipeline","play","plus-square-o","plus-square","plus","preferences","profile","project","push-rules","question-o","question","quote","redo","remove","repeat","retry","scale","screen-full","screen-normal","search","settings","shield","slight-frown","slight-smile","smile","smiley","snippet","spam","star-o","star","stop","talic","task-done","template","thump-down","thump-up","timer","todo-add","todo-done","token","unapproval","unassignee","unlink","user","users","volume-up","warning","work"]}
\ No newline at end of file
+{"iconCount":135,"spriteSize":58718,"icons":["abuse","account","admin","angle-double-left","angle-double-right","angle-down","angle-left","angle-right","angle-up","appearance","applications","approval","arrow-right","assignee","bold","book","branch","calendar","cancel","chevron-down","chevron-left","chevron-right","chevron-up","clock","close","code","comment-dots","comment-next","comment","comments","commit","credit-card","disk","doc_code","doc_image","doc_text","download","duplicate","earth","eye-slash","eye","file-additions","file-deletion","file-modified","filter","folder","fork","geo-nodes","git-merge","group","history","home","hook","issue-block","issue-child","issue-close","issue-duplicate","issue-new","issue-open-m","issue-open","issue-parent","issues","key-2","key","label","labels","leave","level-up","license","link","list-bulleted","list-numbered","location-dot","location","lock-open","lock","log","mail","merge-request-close","messages","mobile-issue-close","monitor","more","notifications-off","notifications","overview","pencil","pipeline","play","plus-square-o","plus-square","plus","preferences","profile","project","push-rules","question-o","question","quote","redo","remove","repeat","retry","scale","screen-full","screen-normal","search","settings","shield","slight-frown","slight-smile","smile","smiley","snippet","spam","star-o","star","stop","talic","task-done","template","thump-down","thump-up","timer","todo-add","todo-done","token","unapproval","unassignee","unlink","user","users","volume-up","warning","work"]}
\ No newline at end of file
diff --git a/app/assets/images/icons.svg b/app/assets/images/icons.svg
index 5c3a9962bd3..30cb2109ec2 100644
--- a/app/assets/images/icons.svg
+++ b/app/assets/images/icons.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/assets/images/sprite.symbol.html b/app/assets/images/sprite.symbol.html
deleted file mode 100644
index d928d3f73b8..00000000000
--- a/app/assets/images/sprite.symbol.html
+++ /dev/null
@@ -1,3297 +0,0 @@
-
-
-
This preview features two methods of using the generated sprite in conjunction with inline SVG. Please have a look at the HTML source for further details and be aware of the following constraints:
The embedded sprite (A) slightly differs from the generated external one. Please see the documentation for details on how to create such an embeddable sprite.
-
Internet Explorer up to version 11 doesn't support external sprites for use with inline SVG. For IE 9-11, you may polyfill this functionality with SVG for Everybody.
-
-
-
-
-
-
-
A) Inline SVG with embedded sprite
-
-
-
-
-
-
-
-
-
-
abuse
-
-
-
-
-
-
-
-
-
account
-
-
-
-
-
-
-
-
-
admin
-
-
-
-
-
-
-
-
-
angle-double-left
-
-
-
-
-
-
-
-
-
angle-down
-
-
-
-
-
-
-
-
-
angle-left
-
-
-
-
-
-
-
-
-
angle-right
-
-
-
-
-
-
-
-
-
angle-up
-
-
-
-
-
-
-
-
-
appearance
-
-
-
-
-
-
-
-
-
applications
-
-
-
-
-
-
-
-
-
approval
-
-
-
-
-
-
-
-
-
arrow-right
-
-
-
-
-
-
-
-
-
assignee
-
-
-
-
-
-
-
-
-
bold
-
-
-
-
-
-
-
-
-
book
-
-
-
-
-
-
-
-
-
branch
-
-
-
-
-
-
-
-
-
calendar
-
-
-
-
-
-
-
-
-
cancel
-
-
-
-
-
-
-
-
-
chevron-down
-
-
-
-
-
-
-
-
-
chevron-left
-
-
-
-
-
-
-
-
-
chevron-right
-
-
-
-
-
-
-
-
-
chevron-up
-
-
-
-
-
-
-
-
-
clock
-
-
-
-
-
-
-
-
-
code
-
-
-
-
-
-
-
-
-
comment
-
-
-
-
-
-
-
-
-
comment-dots
-
-
-
-
-
-
-
-
-
comment-next
-
-
-
-
-
-
-
-
-
comments
-
-
-
-
-
-
-
-
-
commit
-
-
-
-
-
-
-
-
-
credit-card
-
-
-
-
-
-
-
-
-
disk
-
-
-
-
-
-
-
-
-
doc_code
-
-
-
-
-
-
-
-
-
doc_image
-
-
-
-
-
-
-
-
-
doc_text
-
-
-
-
-
-
-
-
-
download
-
-
-
-
-
-
-
-
-
duplicate
-
-
-
-
-
-
-
-
-
earth
-
-
-
-
-
-
-
-
-
eye
-
-
-
-
-
-
-
-
-
eye-slash
-
-
-
-
-
-
-
-
-
file-additions
-
-
-
-
-
-
-
-
-
file-deletion
-
-
-
-
-
-
-
-
-
file-modified
-
-
-
-
-
-
-
-
-
filter
-
-
-
-
-
-
-
-
-
folder
-
-
-
-
-
-
-
-
-
fork
-
-
-
-
-
-
-
-
-
git-merge
-
-
-
-
-
-
-
-
-
group
-
-
-
-
-
-
-
-
-
history
-
-
-
-
-
-
-
-
-
home
-
-
-
-
-
-
-
-
-
hook
-
-
-
-
-
-
-
-
-
issue-block
-
-
-
-
-
-
-
-
-
issue-child
-
-
-
-
-
-
-
-
-
issue-close
-
-
-
-
-
-
-
-
-
issue-duplicate
-
-
-
-
-
-
-
-
-
issue-new
-
-
-
-
-
-
-
-
-
issue-open
-
-
-
-
-
-
-
-
-
issue-open-m
-
-
-
-
-
-
-
-
-
issue-parent
-
-
-
-
-
-
-
-
-
issues
-
-
-
-
-
-
-
-
-
key
-
-
-
-
-
-
-
-
-
key-2
-
-
-
-
-
-
-
-
-
label
-
-
-
-
-
-
-
-
-
labels
-
-
-
-
-
-
-
-
-
leave
-
-
-
-
-
-
-
-
-
level-up
-
-
-
-
-
-
-
-
-
license
-
-
-
-
-
-
-
-
-
link
-
-
-
-
-
-
-
-
-
list-bulleted
-
-
-
-
-
-
-
-
-
list-numbered
-
-
-
-
-
-
-
-
-
location
-
-
-
-
-
-
-
-
-
location-dot
-
-
-
-
-
-
-
-
-
lock
-
-
-
-
-
-
-
-
-
lock-open
-
-
-
-
-
-
-
-
-
log
-
-
-
-
-
-
-
-
-
mail
-
-
-
-
-
-
-
-
-
merge-request-close
-
-
-
-
-
-
-
-
-
merge-request-close-m
-
-
-
-
-
-
-
-
-
messages
-
-
-
-
-
-
-
-
-
mobile-issue-close
-
-
-
-
-
-
-
-
-
monitor
-
-
-
-
-
-
-
-
-
more
-
-
-
-
-
-
-
-
-
notifications
-
-
-
-
-
-
-
-
-
notifications-off
-
-
-
-
-
-
-
-
-
overview
-
-
-
-
-
-
-
-
-
pencil
-
-
-
-
-
-
-
-
-
pipeline
-
-
-
-
-
-
-
-
-
play
-
-
-
-
-
-
-
-
-
plus
-
-
-
-
-
-
-
-
-
plus-square
-
-
-
-
-
-
-
-
-
plus-square-o
-
-
-
-
-
-
-
-
-
preferences
-
-
-
-
-
-
-
-
-
profile
-
-
-
-
-
-
-
-
-
project
-
-
-
-
-
-
-
-
-
push-rules
-
-
-
-
-
-
-
-
-
question
-
-
-
-
-
-
-
-
-
question-o
-
-
-
-
-
-
-
-
-
quote
-
-
-
-
-
-
-
-
-
redo
-
-
-
-
-
-
-
-
-
remove
-
-
-
-
-
-
-
-
-
repeat
-
-
-
-
-
-
-
-
-
retry
-
-
-
-
-
-
-
-
-
scale
-
-
-
-
-
-
-
-
-
screen-full
-
-
-
-
-
-
-
-
-
screen-normal
-
-
-
-
-
-
-
-
-
search
-
-
-
-
-
-
-
-
-
settings
-
-
-
-
-
-
-
-
-
shield
-
-
-
-
-
-
-
-
-
slight-frown
-
-
-
-
-
-
-
-
-
slight-smile
-
-
-
-
-
-
-
-
-
smile
-
-
-
-
-
-
-
-
-
smiley
-
-
-
-
-
-
-
-
-
snippet
-
-
-
-
-
-
-
-
-
spam
-
-
-
-
-
-
-
-
-
star
-
-
-
-
-
-
-
-
-
star-o
-
-
-
-
-
-
-
-
-
stop
-
-
-
-
-
-
-
-
-
talic
-
-
-
-
-
-
-
-
-
task-done
-
-
-
-
-
-
-
-
-
template
-
-
-
-
-
-
-
-
-
thump-down
-
-
-
-
-
-
-
-
-
thump-up
-
-
-
-
-
-
-
-
-
timer
-
-
-
-
-
-
-
-
-
todo-add
-
-
-
-
-
-
-
-
-
todo-done
-
-
-
-
-
-
-
-
-
token
-
-
-
-
-
-
-
-
-
unapproval
-
-
-
-
-
-
-
-
-
unassignee
-
-
-
-
-
-
-
-
-
unlink
-
-
-
-
-
-
-
-
-
user
-
-
-
-
-
-
-
-
-
users
-
-
-
-
-
-
-
-
-
volume-up
-
-
-
-
-
-
-
-
-
warning
-
-
-
-
-
-
-
-
-
work
-
-
-
-
-
-
-
-
-
-
-
B) Inline SVG with external sprite (IE 9-11 with polyfill only)
-
-
-
-
-
-
-
-
-
-
abuse
-
-
-
-
-
-
-
-
-
account
-
-
-
-
-
-
-
-
-
admin
-
-
-
-
-
-
-
-
-
angle-double-left
-
-
-
-
-
-
-
-
-
angle-down
-
-
-
-
-
-
-
-
-
angle-left
-
-
-
-
-
-
-
-
-
angle-right
-
-
-
-
-
-
-
-
-
angle-up
-
-
-
-
-
-
-
-
-
appearance
-
-
-
-
-
-
-
-
-
applications
-
-
-
-
-
-
-
-
-
approval
-
-
-
-
-
-
-
-
-
arrow-right
-
-
-
-
-
-
-
-
-
assignee
-
-
-
-
-
-
-
-
-
bold
-
-
-
-
-
-
-
-
-
book
-
-
-
-
-
-
-
-
-
branch
-
-
-
-
-
-
-
-
-
calendar
-
-
-
-
-
-
-
-
-
cancel
-
-
-
-
-
-
-
-
-
chevron-down
-
-
-
-
-
-
-
-
-
chevron-left
-
-
-
-
-
-
-
-
-
chevron-right
-
-
-
-
-
-
-
-
-
chevron-up
-
-
-
-
-
-
-
-
-
clock
-
-
-
-
-
-
-
-
-
code
-
-
-
-
-
-
-
-
-
comment
-
-
-
-
-
-
-
-
-
comment-dots
-
-
-
-
-
-
-
-
-
comment-next
-
-
-
-
-
-
-
-
-
comments
-
-
-
-
-
-
-
-
-
commit
-
-
-
-
-
-
-
-
-
credit-card
-
-
-
-
-
-
-
-
-
disk
-
-
-
-
-
-
-
-
-
doc_code
-
-
-
-
-
-
-
-
-
doc_image
-
-
-
-
-
-
-
-
-
doc_text
-
-
-
-
-
-
-
-
-
download
-
-
-
-
-
-
-
-
-
duplicate
-
-
-
-
-
-
-
-
-
earth
-
-
-
-
-
-
-
-
-
eye
-
-
-
-
-
-
-
-
-
eye-slash
-
-
-
-
-
-
-
-
-
file-additions
-
-
-
-
-
-
-
-
-
file-deletion
-
-
-
-
-
-
-
-
-
file-modified
-
-
-
-
-
-
-
-
-
filter
-
-
-
-
-
-
-
-
-
folder
-
-
-
-
-
-
-
-
-
fork
-
-
-
-
-
-
-
-
-
git-merge
-
-
-
-
-
-
-
-
-
group
-
-
-
-
-
-
-
-
-
history
-
-
-
-
-
-
-
-
-
home
-
-
-
-
-
-
-
-
-
hook
-
-
-
-
-
-
-
-
-
issue-block
-
-
-
-
-
-
-
-
-
issue-child
-
-
-
-
-
-
-
-
-
issue-close
-
-
-
-
-
-
-
-
-
issue-duplicate
-
-
-
-
-
-
-
-
-
issue-new
-
-
-
-
-
-
-
-
-
issue-open
-
-
-
-
-
-
-
-
-
issue-open-m
-
-
-
-
-
-
-
-
-
issue-parent
-
-
-
-
-
-
-
-
-
issues
-
-
-
-
-
-
-
-
-
key
-
-
-
-
-
-
-
-
-
key-2
-
-
-
-
-
-
-
-
-
label
-
-
-
-
-
-
-
-
-
labels
-
-
-
-
-
-
-
-
-
leave
-
-
-
-
-
-
-
-
-
level-up
-
-
-
-
-
-
-
-
-
license
-
-
-
-
-
-
-
-
-
link
-
-
-
-
-
-
-
-
-
list-bulleted
-
-
-
-
-
-
-
-
-
list-numbered
-
-
-
-
-
-
-
-
-
location
-
-
-
-
-
-
-
-
-
location-dot
-
-
-
-
-
-
-
-
-
lock
-
-
-
-
-
-
-
-
-
lock-open
-
-
-
-
-
-
-
-
-
log
-
-
-
-
-
-
-
-
-
mail
-
-
-
-
-
-
-
-
-
merge-request-close
-
-
-
-
-
-
-
-
-
merge-request-close-m
-
-
-
-
-
-
-
-
-
messages
-
-
-
-
-
-
-
-
-
mobile-issue-close
-
-
-
-
-
-
-
-
-
monitor
-
-
-
-
-
-
-
-
-
more
-
-
-
-
-
-
-
-
-
notifications
-
-
-
-
-
-
-
-
-
notifications-off
-
-
-
-
-
-
-
-
-
overview
-
-
-
-
-
-
-
-
-
pencil
-
-
-
-
-
-
-
-
-
pipeline
-
-
-
-
-
-
-
-
-
play
-
-
-
-
-
-
-
-
-
plus
-
-
-
-
-
-
-
-
-
plus-square
-
-
-
-
-
-
-
-
-
plus-square-o
-
-
-
-
-
-
-
-
-
preferences
-
-
-
-
-
-
-
-
-
profile
-
-
-
-
-
-
-
-
-
project
-
-
-
-
-
-
-
-
-
push-rules
-
-
-
-
-
-
-
-
-
question
-
-
-
-
-
-
-
-
-
question-o
-
-
-
-
-
-
-
-
-
quote
-
-
-
-
-
-
-
-
-
redo
-
-
-
-
-
-
-
-
-
remove
-
-
-
-
-
-
-
-
-
repeat
-
-
-
-
-
-
-
-
-
retry
-
-
-
-
-
-
-
-
-
scale
-
-
-
-
-
-
-
-
-
screen-full
-
-
-
-
-
-
-
-
-
screen-normal
-
-
-
-
-
-
-
-
-
search
-
-
-
-
-
-
-
-
-
settings
-
-
-
-
-
-
-
-
-
shield
-
-
-
-
-
-
-
-
-
slight-frown
-
-
-
-
-
-
-
-
-
slight-smile
-
-
-
-
-
-
-
-
-
smile
-
-
-
-
-
-
-
-
-
smiley
-
-
-
-
-
-
-
-
-
snippet
-
-
-
-
-
-
-
-
-
spam
-
-
-
-
-
-
-
-
-
star
-
-
-
-
-
-
-
-
-
star-o
-
-
-
-
-
-
-
-
-
stop
-
-
-
-
-
-
-
-
-
talic
-
-
-
-
-
-
-
-
-
task-done
-
-
-
-
-
-
-
-
-
template
-
-
-
-
-
-
-
-
-
thump-down
-
-
-
-
-
-
-
-
-
thump-up
-
-
-
-
-
-
-
-
-
timer
-
-
-
-
-
-
-
-
-
todo-add
-
-
-
-
-
-
-
-
-
todo-done
-
-
-
-
-
-
-
-
-
token
-
-
-
-
-
-
-
-
-
unapproval
-
-
-
-
-
-
-
-
-
unassignee
-
-
-
-
-
-
-
-
-
unlink
-
-
-
-
-
-
-
-
-
user
-
-
-
-
-
-
-
-
-
users
-
-
-
-
-
-
-
-
-
volume-up
-
-
-
-
-
-
-
-
-
warning
-
-
-
-
-
-
-
-
-
work
-
-
-
-
-
-
-
-
-
diff --git a/app/assets/javascripts/blob/notebook/index.js b/app/assets/javascripts/blob/notebook/index.js
index 27312d718b0..c858a6bb7b4 100644
--- a/app/assets/javascripts/blob/notebook/index.js
+++ b/app/assets/javascripts/blob/notebook/index.js
@@ -40,10 +40,10 @@ export default () => {
class="text-center"
v-if="error">
- An error occured whilst loading the file. Please try again later.
+ An error occurred whilst loading the file. Please try again later.
- An error occured whilst parsing the file.
+ An error occurred whilst parsing the file.
diff --git a/app/assets/javascripts/blob/pdf/index.js b/app/assets/javascripts/blob/pdf/index.js
index 0ed915c1ac9..7109f356540 100644
--- a/app/assets/javascripts/blob/pdf/index.js
+++ b/app/assets/javascripts/blob/pdf/index.js
@@ -48,10 +48,10 @@ export default () => {
class="text-center"
v-if="error">
- An error occured whilst loading the file. Please try again later.
+ An error occurred whilst loading the file. Please try again later.
- An error occured whilst decoding the file.
+ An error occurred whilst decoding the file.
diff --git a/app/assets/javascripts/boards/boards_bundle.js b/app/assets/javascripts/boards/boards_bundle.js
index ea00efe4b46..815248f38ee 100644
--- a/app/assets/javascripts/boards/boards_bundle.js
+++ b/app/assets/javascripts/boards/boards_bundle.js
@@ -77,9 +77,6 @@ $(() => {
});
Store.rootPath = this.boardsEndpoint;
- this.filterManager = new FilteredSearchBoards(Store.filter, true);
- this.filterManager.setup();
-
// Listen for updateTokens event
eventHub.$on('updateTokens', this.updateTokens);
},
@@ -87,6 +84,9 @@ $(() => {
eventHub.$off('updateTokens', this.updateTokens);
},
mounted () {
+ this.filterManager = new FilteredSearchBoards(Store.filter, true);
+ this.filterManager.setup();
+
Store.disabled = this.disabled;
gl.boardService.all()
.then(response => response.json())
diff --git a/app/assets/javascripts/boards/components/board_new_issue.js b/app/assets/javascripts/boards/components/board_new_issue.js
index 541b8049855..bc28f7f45f4 100644
--- a/app/assets/javascripts/boards/components/board_new_issue.js
+++ b/app/assets/javascripts/boards/components/board_new_issue.js
@@ -68,7 +68,7 @@ export default {
- An error occured. Please try again.
+ An error occurred. Please try again.