Permalink
Browse files

Merge branch 'master' into fix_project_access_notification

  • Loading branch information...
2 parents e6ce472 + 3c132f2 commit c09d233611e00328f0e8d493a106737f0638d9a2 @AlexDenisov AlexDenisov committed Sep 26, 2012
Showing with 1,150 additions and 838 deletions.
  1. +6 −1 CHANGELOG
  2. +1 −0 Gemfile
  3. +2 −0 Gemfile.lock
  4. +1 −0 Guardfile
  5. +1 −1 VERSION
  6. +1 −0 app/assets/javascripts/application.js
  7. +1 −0 app/assets/stylesheets/application.css
  8. +0 −81 app/assets/stylesheets/common.scss
  9. +2 −2 app/assets/stylesheets/gitlab_bootstrap/lists.scss
  10. +1 −0 app/assets/stylesheets/main.scss
  11. +23 −23 app/assets/stylesheets/sections/commits.scss
  12. +118 −0 app/assets/stylesheets/sections/events.scss
  13. +5 −1 app/assets/stylesheets/sections/notes.scss
  14. +3 −3 app/controllers/admin/users_controller.rb
  15. +1 −0 app/controllers/commits_controller.rb
  16. +0 −1 app/controllers/hooks_controller.rb
  17. +0 −1 app/controllers/issues_controller.rb
  18. +0 −1 app/controllers/labels_controller.rb
  19. +0 −1 app/controllers/merge_requests_controller.rb
  20. +0 −1 app/controllers/milestones_controller.rb
  21. +0 −1 app/controllers/snippets_controller.rb
  22. +6 −2 app/helpers/tree_helper.rb
  23. +8 −4 app/models/commit.rb
  24. +1 −0 app/models/event.rb
  25. +3 −2 app/models/user.rb
  26. +8 −0 app/roles/repository.rb
  27. +16 −12 app/views/commits/compare.html.haml
  28. +1 −1 app/views/events/_commit.html.haml
  29. +9 −8 app/views/events/_event.html.haml
  30. +7 −10 app/views/events/_event_issue.html.haml
  31. +1 −1 app/views/events/_event_last_push.html.haml
  32. +7 −7 app/views/events/_event_membership_changed.html.haml
  33. +12 −14 app/views/events/_event_merge_request.html.haml
  34. +18 −22 app/views/events/_event_push.html.haml
  35. +78 −59 app/views/help/api.html.haml
  36. +11 −0 app/views/notes/_common_form.html.haml
  37. +5 −1 app/views/refs/_tree.html.haml
  38. +5 −1 app/views/refs/_tree_file.html.haml
  39. +31 −0 config/initializers/4_resque.rb
  40. +0 −1 config/initializers/4_resque_queues.rb
  41. +0 −8 config/initializers/resque.rb
  42. +0 −14 config/initializers/resque_authentication.rb
  43. +0 −1 config/initializers/resque_mailer.rb
  44. +1 −1 config/unicorn.rb.example
  45. +2 −1 doc/api/README.md
  46. +0 −79 doc/api/keys.md
  47. +43 −152 doc/api/projects.md
  48. +166 −0 doc/api/repositories.md
  49. +22 −0 doc/api/session.md
  50. +78 −0 doc/api/users.md
  51. +1 −1 features/steps/dashboard/dashboard.rb
  52. +1 −1 lib/api.rb
  53. +17 −8 lib/api/entities.rb
  54. +1 −1 lib/api/helpers.rb
  55. +0 −50 lib/api/keys.rb
  56. +6 −0 lib/api/milestones.rb
  57. +82 −33 lib/api/projects.rb
  58. +20 −0 lib/api/session.rb
  59. +53 −6 lib/api/users.rb
  60. +2 −2 lib/gitlab/graph_commit.rb
  61. +11 −17 lib/tasks/bulk_add_permission.rake
  62. +23 −51 lib/tasks/bulk_import.rake
  63. +21 −25 lib/tasks/gitlab/backup.rake
  64. +1 −1 lib/tasks/gitlab/enable_automerge.rake
  65. +2 −3 lib/tasks/gitlab/gitolite_rebuild.rake
  66. +1 −2 lib/tasks/gitlab/setup.rake
  67. +18 −19 lib/tasks/gitlab/status.rake
  68. +0 −2 lib/tasks/gitlab/write_hook.rake
  69. +1 −1 spec/helpers/tree_helper_spec.rb
  70. +26 −0 spec/models/user_spec.rb
  71. +53 −22 spec/requests/api/projects_spec.rb
  72. +39 −0 spec/requests/api/session_spec.rb
  73. +0 −73 spec/requests/api/ssh_keys_spec.rb
  74. +66 −1 spec/requests/api/users_spec.rb
View
@@ -1,3 +1,6 @@
+v 2.9.1
+ - Fixed resque custom config init
+
v 2.9.0
- fixed inline notes bugs
- refactored rspecs
@@ -9,8 +12,10 @@ v 2.9.0
- scss refactoring. gitlab_bootstrap/ dir
- fix git push http body bigger than 112k problem
- list of labels page under issues tab
- - API for milestones
+ - API for milestones, keys
- restyled buttons
+ - OAuth
+ - Comment order changed
v 2.8.1
- ability to disable gravatars
View
@@ -96,6 +96,7 @@ group :assets do
gem "therubyracer"
gem 'chosen-rails'
+ gem 'jquery-atwho-rails', '0.1.6'
gem "jquery-rails", "2.0.2"
gem "jquery-ui-rails", "0.5.0"
gem "modernizr", "2.5.3"
View
@@ -199,6 +199,7 @@ GEM
httpauth (0.1)
i18n (0.6.1)
journey (1.0.4)
+ jquery-atwho-rails (0.1.6)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
@@ -441,6 +442,7 @@ DEPENDENCIES
haml-rails
headless
httparty
+ jquery-atwho-rails (= 0.1.6)
jquery-rails (= 2.0.2)
jquery-ui-rails (= 0.5.0)
kaminari
View
@@ -4,6 +4,7 @@
guard 'rspec', :version => 2, :all_on_start => false, :all_after_pass => false do
watch(%r{^spec/.+_spec\.rb$})
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
+ watch(%r{^lib/api/(.+)\.rb$}) { |m| "spec/requests/api/#{m[1]}_spec.rb" }
watch('spec/spec_helper.rb') { "spec" }
# Rails example
View
@@ -1 +1 @@
-2.9.0pre
+2.9.1
@@ -11,6 +11,7 @@
//= require jquery.endless-scroll
//= require jquery.highlight
//= require jquery.waitforimages
+//= require jquery.atwho
//= require bootstrap
//= require modernizr
//= require chosen-jquery
@@ -4,6 +4,7 @@
* the top of the compiled file, but it's generally better to create a new file per style scope.
*= require jquery.ui.all
*= require jquery.ui.aristo
+ *= require jquery.atwho
*= require chosen
*= require_self
*= require main
@@ -185,36 +185,6 @@ span.update-author {
}
}
-.event_label {
- @extend .label;
- background-color: #999;
-
- &.pushed {
- background-color: #4A97BD;
- }
-
- &.opened {
- background-color: #469847;
- }
-
- &.closed {
- background-color: #B94A48;
- }
-
- &.merged {
- background-color: #2A2;
- }
-
- &.joined {
- background-color: #1ca9dd;
- }
-
- &.left {
- background-color: #888;
- float:none;
- }
-}
-
form {
@extend .form-horizontal;
@@ -355,41 +325,6 @@ p.time {
border:2px solid #ddd;
}
-.event_feed {
- min-height:40px;
- border-bottom:1px solid #ddd;
- .avatar {
- width:32px;
- }
- .event_icon {
- float:right;
- margin-right:2px;
- img {
- width:20px;
- }
- }
- ul {
- margin-left:50px;
- margin-bottom:5px;
- .avatar {
- width:24px;
- }
- }
-
- padding: 15px 5px;
- &:last-child { border:none }
- .wll:hover { background:none }
-
- .event_commits {
- margin-top: 5px;
-
- li.commit {
- background: transparent;
- padding:5px;
- border:none;
- }
- }
-}
.ico {
background: url("images.png") no-repeat -85px -77px;
@@ -639,22 +574,6 @@ li.note {
background:#fff;
}
-/**
- * Push event widget
- *
- */
-.event_lp {
- @extend .ui-box;
- color:#777;
- margin-bottom:20px;
- padding:8px;
- @include border-radius(4px);
- min-height:22px;
-
- .avatar {
- width:24px;
- }
-}
.supp_diff_link,
.mr_show_all_commits {
@@ -1,6 +1,6 @@
/** LISTS **/
-ul {
+ul {
/**
* List li block element #1
*
@@ -18,7 +18,7 @@ ul {
.author { color: #999; }
p {
- padding-top:5px;
+ padding-top:5px;
margin:0;
color:#222;
img {
@@ -143,6 +143,7 @@ $hover: #fdf5d9;
@import "sections/projects.scss";
@import "sections/merge_requests.scss";
@import "sections/graph.scss";
+@import "sections/events.scss";
/**
* This scss file redefine chozen selectbox styles for
@@ -1,7 +1,7 @@
.commit-box {
@extend .main_box;
- .commit-head {
+ .commit-head {
@extend .top_box_content;
.commit-title {
@@ -29,11 +29,11 @@
.sha-block {
text-align:right;
- &:first-child {
+ &:first-child {
padding-bottom:6px;
}
- a {
+ a {
border-bottom: 1px solid #aaa;
margin-left: 9px;
}
@@ -54,7 +54,7 @@
}
/**
- *
+ *
* COMMIT SHOw
*
*/
@@ -71,7 +71,7 @@
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
- span {
+ span {
font-size:14px;
}
}
@@ -111,21 +111,21 @@
}
}
- &.img_compared {
- img {
+ &.img_compared {
+ img {
max-width:300px;
}
}
}
}
.diff_file_content{
- table {
+ table {
border:none;
margin:0px;
padding:0px;
tr {
- td {
+ td {
font-size:12px;
}
}
@@ -145,29 +145,29 @@
moz-user-select: none;
-khtml-user-select: none;
user-select: none;
- a {
+ a {
float:left;
width:35px;
font-weight:normal;
color:#666;
- &:hover {
+ &:hover {
text-decoration:underline;
}
}
}
- .line_content {
- white-space:pre;
+ .line_content {
+ white-space:pre;
height:14px;
margin:0px;
padding:0px;
border:none;
- &.new {
+ &.new {
background: #CFD;
}
- &.old {
+ &.old {
background: #FDD;
}
- &.matched {
+ &.matched {
color:#ccc;
background:#fafafa;
}
@@ -182,32 +182,32 @@
/** COMMIT ROW **/
-.commit {
+.commit {
@extend .wll;
- .browse_code_link_holder {
+ .browse_code_link_holder {
@extend .span2;
float:right;
}
- .committed_ago {
+ .committed_ago {
float:right;
@extend .cgray;
}
- code {
+ code {
background:#FCEEC1;
color:$style_color;
}
- .commit_short_id {
+ .commit_short_id {
float:left;
@extend .lined;
min-width:65px;
font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
}
-
- .commit-author-name {
+
+ .commit-author-name {
color: #777;
}
}
Oops, something went wrong.

0 comments on commit c09d233

Please sign in to comment.