summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-11 15:26:18 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-11 15:26:18 +0300
commit019a510b50929da267b810b7663b8bfa0ee34b3c (patch)
tree1443351c123b957fb45e41adedf90a81a122b56c
parent975518e2e037a33b21efe40c807b465fce3b2a68 (diff)
downloadgitlab-ci-019a510b50929da267b810b7663b8bfa0ee34b3c.tar.gz
Dont show archived projects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--CHANGELOG1
-rw-r--r--app/models/network.rb3
-rw-r--r--app/views/projects/_gitlab.html.haml3
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 28d1476..541ea8b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
v5.1
- Registration token and runner token are named differently
- Redirect to previous page after sign-in
+ - Dont show archived projects
v5.0.1
- Update rails to 4.0.5
diff --git a/app/models/network.rb b/app/models/network.rb
index c10ee75..f140dfb 100644
--- a/app/models/network.rb
+++ b/app/models/network.rb
@@ -37,6 +37,9 @@ class Network
def projects(url, api_opts, scope = :owned)
+ # Dont load archived projects
+ api_opts.merge!(archived: false)
+
opts = {
query: api_opts,
headers: {"Content-Type" => "application/json"},
diff --git a/app/views/projects/_gitlab.html.haml b/app/views/projects/_gitlab.html.haml
index 9ca7fdd..d51aca1 100644
--- a/app/views/projects/_gitlab.html.haml
+++ b/app/views/projects/_gitlab.html.haml
@@ -54,5 +54,4 @@
:coffeescript
$('.gitlab-projects-pagination').on 'ajax:before', ->
- $('.projects').html('<h1><i class="icon-spinner icon-loading"/></h1>')
-
+ $('.projects').html('<h1><i class="icon-spinner icon-spin"/></h1>')