Showing with 4,499 additions and 1,503 deletions.
  1. +1 −0 .gitignore
  2. +11 −0 CHANGELOG
  3. +20 −15 Gemfile
  4. +49 −23 Gemfile.lock
  5. +1 −1 README.md
  6. +1 −1 VERSION
  7. BIN app/assets/images/ajax_loader.gif
  8. BIN app/assets/images/ajax_loader_tree.gif
  9. BIN app/assets/images/no_avatar.png
  10. +11 −0 app/assets/javascripts/admin.js
  11. +24 −2 app/assets/javascripts/application.js
  12. +2 −1 app/assets/javascripts/graph.js
  13. +35 −1 app/assets/javascripts/issues.js
  14. +49 −8 app/assets/javascripts/merge_requests.js
  15. +2 −2 app/assets/javascripts/note.js
  16. +23 −26 app/assets/stylesheets/common.scss
  17. +242 −4 app/assets/stylesheets/gitlab_bootstrap.scss
  18. +11 −9 app/assets/stylesheets/header.scss
  19. +7 −1 app/assets/stylesheets/main.scss
  20. +35 −30 app/assets/stylesheets/nav.scss
  21. +11 −4 app/assets/stylesheets/notes.scss
  22. +20 −6 app/assets/stylesheets/sections/commits.scss
  23. +13 −0 app/assets/stylesheets/sections/issues.scss
  24. +22 −0 app/assets/stylesheets/sections/merge_requests.scss
  25. +96 −0 app/assets/stylesheets/sections/tree.scss
  26. +1 −2 app/assets/stylesheets/themes/ui_mars.scss
  27. +4 −2 app/assets/stylesheets/themes/ui_modern.scss
  28. +0 −232 app/assets/stylesheets/tree.scss
  29. +8 −0 app/contexts/base_context.rb
  30. +26 −0 app/contexts/commit_load.rb
  31. +16 −0 app/contexts/merge_requests_load.rb
  32. +30 −0 app/contexts/notes_load.rb
  33. +44 −0 app/controllers/admin/hooks_controller.rb
  34. +6 −0 app/controllers/admin/logs_controller.rb
  35. +0 −45 app/controllers/admin/mailer_controller.rb
  36. +2 −2 app/controllers/admin/projects_controller.rb
  37. +5 −0 app/controllers/admin/resque_controller.rb
  38. +1 −1 app/controllers/admin/users_controller.rb
  39. +10 −2 app/controllers/application_controller.rb
  40. +27 −28 app/controllers/commits_controller.rb
  41. +3 −5 app/controllers/dashboard_controller.rb
  42. +6 −6 app/controllers/hooks_controller.rb
  43. +17 −5 app/controllers/issues_controller.rb
  44. +27 −25 app/controllers/merge_requests_controller.rb
  45. +1 −20 app/controllers/notes_controller.rb
  46. +13 −0 app/controllers/omniauth_callbacks_controller.rb
  47. +7 −14 app/controllers/projects_controller.rb
  48. +22 −1 app/controllers/refs_controller.rb
  49. +0 −4 app/decorators/commit_decorator.rb
  50. +25 −0 app/decorators/event_decorator.rb
  51. +48 −3 app/helpers/application_helper.rb
  52. +9 −7 app/helpers/commits_helper.rb
  53. +4 −1 app/helpers/issues_helper.rb
  54. +0 −1 app/helpers/merge_requests_helper.rb
  55. +27 −0 app/helpers/tree_helper.rb
  56. +4 −3 app/mailers/notify.rb
  57. +24 −0 app/models/commit.rb
  58. +9 −4 app/models/event.rb
  59. +33 −17 app/models/issue.rb
  60. +5 −5 app/models/key.rb
  61. +39 −10 app/models/merge_request.rb
  62. +14 −0 app/models/milestone.rb
  63. +13 −5 app/models/note.rb
  64. +34 −17 app/models/project.rb
  65. +3 −0 app/models/project_hook.rb
  66. +2 −2 app/models/protected_branch.rb
  67. +5 −5 app/models/snippet.rb
  68. +13 −0 app/models/system_hook.rb
  69. +34 −11 app/models/user.rb
  70. +7 −7 app/models/users_project.rb
  71. +5 −8 app/models/web_hook.rb
  72. +3 −3 app/models/wiki.rb
  73. 0 app/{models → observers}/activity_observer.rb
  74. +25 −0 app/observers/issue_observer.rb
  75. 0 app/{models → observers}/key_observer.rb
  76. +3 −20 app/{models → observers}/mailer_observer.rb
  77. 0 app/{models → observers}/project_observer.rb
  78. +67 −0 app/observers/system_hook_observer.rb
  79. +5 −0 app/observers/user_observer.rb
  80. +4 −0 app/roles/account.rb
  81. +9 −11 app/roles/git_push.rb
  82. +9 −1 app/roles/repository.rb
  83. +1 −1 app/views/admin/dashboard/index.html.haml
  84. +66 −0 app/views/admin/hooks/_data_ex.html.erb
  85. +39 −0 app/views/admin/hooks/index.html.haml
  86. +9 −0 app/views/admin/logs/show.html.haml
  87. +0 −28 app/views/admin/mailer/preview.html.haml
  88. +1 −1 app/views/admin/projects/_form.html.haml
  89. +3 −3 app/views/admin/projects/index.html.haml
  90. +2 −0 app/views/admin/resque/show.html.haml
  91. +18 −9 app/views/admin/users/_form.html.haml
  92. +2 −2 app/views/admin/users/index.html.haml
  93. +11 −2 app/views/commits/_commit_box.html.haml
  94. +3 −1 app/views/commits/_commits.html.haml
  95. +12 −4 app/views/commits/_diffs.html.haml
  96. +2 −2 app/views/commits/_head.html.haml
  97. +1 −1 app/views/commits/_text_file.html.haml
  98. +1 −1 app/views/commits/compare.html.haml
  99. +3 −10 app/views/dashboard/index.atom.builder
  100. +6 −1 app/views/dashboard/index.html.haml
  101. +1 −1 app/views/dashboard/index.js.haml
  102. +2 −10 app/views/dashboard/issues.html.haml
  103. +1 −1 app/views/dashboard/merge_requests.html.haml
  104. +2 −2 app/views/events/_event_issue.html.haml
  105. +2 −5 app/views/events/_event_last_push.html.haml
  106. +2 −2 app/views/events/_event_merge_request.html.haml
  107. +1 −1 app/views/events/_event_push.html.haml
  108. +41 −0 app/views/help/api.html.haml
  109. +17 −4 app/views/help/index.html.haml
  110. +3 −0 app/views/help/permissions.html.haml
  111. +13 −0 app/views/help/system_hooks.html.haml
  112. +10 −2 app/views/help/web_hooks.html.haml
  113. +3 −0 app/views/help/workflow.html.haml
  114. +2 −1 app/views/hooks/_data_ex.html.erb
  115. +17 −11 app/views/issues/_form.html.haml
  116. +4 −5 app/views/issues/_issues.html.haml
  117. +23 −9 app/views/issues/_show.html.haml
  118. +28 −69 app/views/issues/index.html.haml
  119. +0 −1 app/views/issues/index.js.haml
  120. +13 −4 app/views/issues/show.html.haml
  121. +5 −2 app/views/keys/index.html.haml
  122. +2 −2 app/views/keys/new.html.haml
  123. +1 −1 app/views/keys/show.html.haml
  124. +19 −11 app/views/layouts/_app_menu.html.haml
  125. +28 −16 app/views/layouts/_project_menu.html.haml
  126. +13 −6 app/views/layouts/admin.html.haml
  127. 0 app/views/layouts/{devise.html.haml → devise_layout.html.haml}
  128. +19 −7 app/views/layouts/profile.html.haml
  129. +0 −3 app/views/merge_requests/_diffs.html.haml
  130. +14 −6 app/views/merge_requests/_form.html.haml
  131. +15 −8 app/views/merge_requests/_merge_request.html.haml
  132. +39 −0 app/views/merge_requests/_show.html.haml
  133. +2 −0 app/views/merge_requests/diffs.html.haml
  134. +1 −1 app/views/merge_requests/diffs.js.haml
  135. +1 −1 app/views/merge_requests/edit.html.haml
  136. +1 −14 app/views/merge_requests/index.html.haml
  137. +1 −1 app/views/merge_requests/new.html.haml
  138. +1 −139 app/views/merge_requests/show.html.haml
  139. +2 −0 app/views/merge_requests/show.js.haml
  140. +3 −1 app/views/merge_requests/{ → show}/_commits.html.haml
  141. +8 −0 app/views/merge_requests/show/_diffs.html.haml
  142. 0 app/views/merge_requests/{ → show}/_how_to_merge.html.haml
  143. +42 −0 app/views/merge_requests/show/_mr_accept.html.haml
  144. +32 −0 app/views/merge_requests/show/_mr_box.html.haml
  145. +33 −0 app/views/merge_requests/show/_mr_title.html.haml
  146. +4 −4 app/views/milestones/_milestone.html.haml
  147. +1 −1 app/views/milestones/index.html.haml
  148. +2 −4 app/views/milestones/show.html.haml
  149. +1 −1 app/views/notes/_form.html.haml
  150. +1 −1 app/views/notes/_per_line_form.html.haml
  151. +1 −0 app/views/notes/_reply_button.html.haml
  152. +2 −3 app/views/profile/password.html.haml
  153. +1 −1 app/views/profile/show.html.haml
  154. +6 −5 app/views/profile/token.html.haml
  155. +4 −5 app/views/projects/_form.html.haml
  156. +1 −1 app/views/projects/_new_form.html.haml
  157. +4 −1 app/views/projects/create.js.haml
  158. +1 −1 app/views/projects/edit.html.haml
  159. +1 −1 app/views/projects/graph.html.haml
  160. +1 −1 app/views/projects/new.html.haml
  161. +16 −5 app/views/projects/show.html.haml
  162. +2 −4 app/views/projects/team.html.haml
  163. +17 −12 app/views/refs/_tree.html.haml
  164. +3 −0 app/views/refs/_tree_commit.html.haml
  165. +17 −15 app/views/refs/_tree_file.html.haml
  166. +9 −21 app/views/refs/_tree_item.html.haml
  167. +5 −6 app/views/refs/blame.html.haml
  168. +9 −0 app/views/refs/logs_tree.js.haml
  169. +6 −0 app/views/refs/tree.js.haml
  170. +58 −47 app/views/search/show.html.haml
  171. +9 −11 app/views/snippets/show.html.haml
  172. +2 −2 app/views/wikis/show.html.haml
  173. +7 −3 app/workers/post_receive.rb
  174. +7 −0 app/workers/system_hook_worker.rb
  175. +3 −3 config/application.rb
  176. +30 −8 config/gitlab.yml.example
  177. +0 −3 config/initializers/00_before_all.rb
  178. +115 −0 config/initializers/1_settings.rb
  179. +8 −0 config/initializers/2_app.rb
  180. +2 −2 config/initializers/{gitlabhq/20_grit_ext.rb → 3_grit_ext.rb}
  181. 0 config/initializers/{gitlabhq/30_resque_queues.rb → 4_resque_queues.rb}
  182. +7 −11 config/initializers/devise.rb
  183. +54 −0 config/initializers/grack_auth.rb
  184. +0 −5 config/initializers/protect_resque.rb.example
  185. +14 −0 config/initializers/resque_authentication.rb
  186. +1 −0 config/initializers/resque_mailer.rb
  187. +3 −5 config/locales/devise.en.yml
  188. +56 −22 config/routes.rb
  189. +37 −9 db/migrate/20110913200833_devise_create_users.rb
  190. +9 −0 db/migrate/20120627145613_remove_critical_from_issue.rb
  191. +6 −0 db/migrate/20120706065612_add_lockable_to_users.rb
  192. +5 −0 db/migrate/20120712080407_add_type_to_web_hook.rb
  193. +8 −6 db/schema.rb
  194. +29 −0 doc/api/README.md
  195. +270 −0 doc/api/projects.md
  196. +90 −0 doc/api/users.md
  197. +16 −14 doc/installation.md
  198. +12 −0 features/projects/issues/issues.feature
  199. +22 −0 features/step_definitions/project_issues_steps.rb
  200. +19 −0 lib/api.rb
  201. +33 −0 lib/api/entities.rb
  202. +11 −0 lib/api/helpers.rb
  203. +144 −0 lib/api/projects.rb
  204. +36 −0 lib/api/users.rb
  205. +2 −0 lib/color.rb
  206. +2 −6 lib/gitlab/git_host.rb
  207. +1 −1 lib/gitlab/gitolite.rb
  208. +68 −0 lib/gitlab/inline_diff.rb
  209. +19 −3 lib/gitlab/logger.rb
  210. +190 −0 lib/tasks/gitlab/backup.rake
  211. +7 −7 lib/tasks/gitlab/status.rake
  212. +1 −1 resque.sh
  213. +1 −1 resque_dev.sh
  214. +94 −0 spec/api/projects_spec.rb
  215. +37 −0 spec/api/users_spec.rb
  216. +11 −1 spec/factories.rb
  217. +12 −16 spec/mailers/notify_spec.rb
  218. +10 −6 spec/models/activity_observer_spec.rb
  219. +5 −4 spec/models/event_spec.rb
  220. +144 −0 spec/models/issue_observer_spec.rb
  221. +68 −16 spec/models/issue_spec.rb
  222. +5 −5 spec/models/key_spec.rb
  223. +11 −8 spec/models/merge_request_spec.rb
  224. +14 −0 spec/models/milestone_spec.rb
  225. +24 −5 spec/models/note_spec.rb
  226. +15 −15 spec/models/project_hooks_spec.rb
  227. +29 −16 spec/models/project_spec.rb
  228. +2 −2 spec/models/protected_branch_spec.rb
  229. +5 −5 spec/models/snippet_spec.rb
  230. +63 −0 spec/models/system_hook_spec.rb
  231. +26 −0 spec/models/user_observer_spec.rb
  232. +29 −7 spec/models/user_spec.rb
  233. +6 −6 spec/models/users_project_spec.rb
  234. +14 −14 spec/models/web_hook_spec.rb
  235. +7 −8 spec/models/wiki_spec.rb
  236. +53 −0 spec/requests/admin/admin_hooks_spec.rb
  237. +1 −0 spec/requests/admin/admin_projects_spec.rb
  238. +14 −7 spec/requests/admin/admin_users_spec.rb
  239. +4 −4 spec/requests/admin/security_spec.rb
  240. +4 −3 spec/requests/hooks_spec.rb
  241. +13 −7 spec/requests/issues_spec.rb
  242. +1 −1 spec/requests/projects_spec.rb
  243. +5 −0 spec/spec_helper.rb
  244. +7 −0 spec/support/api.rb
  245. 0 spec/support/security.rb
  246. +2 −2 spec/workers/post_receive_spec.rb
  247. +144 −0 vendor/assets/javascripts/jquery.waitforimages.js
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ log/*.log
tmp/
.sass-cache/
coverage/*
backups/*
*.swp
public/uploads/
.rvmrc
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
v 2.7.0
- Issue Labels
- Inline diff
- Git HTTP
- API
- UI improved
- System hooks
- UI improved
- Dashboard events endless scroll
- Source perfomance increased

v 2.6.0
- UI polished
- Improved network graph + keyboard nav
Expand Down
35 changes: 20 additions & 15 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,18 @@ gem "sqlite3"
gem "mysql2"

# Auth
gem "devise", "~> 1.5"
gem "devise", "~> 2.1.0"

# GITLAB patched libs
gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
gem "pygments.rb", :git => "https://github.com/gitlabhq/pygments.rb.git", :ref => "2cada028da5054616634a1d9ca6941b65b3ce188"
gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
gem "pygments.rb", :git => "https://github.com/gitlabhq/pygments.rb.git", :ref => "2cada028da5054616634a1d9ca6941b65b3ce188"
gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "7edf27d0281e09561838122982c16b7e62181f44"
gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
gem 'grack', :git => "https://github.com/gitlabhq/grack.git"
gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"

gem "grape"
gem "stamp"
gem "kaminari"
gem "haml-rails"
Expand All @@ -28,28 +31,29 @@ gem "thin"
gem "unicorn"
gem "git"
gem "acts_as_list"
gem "acts-as-taggable-on", "~> 2.1.0"
gem "acts-as-taggable-on", "2.3.1"
gem "drapper"
gem "resque", "~> 1.20.0"
gem "httparty"
gem "charlock_holmes"
gem "foreman"
gem "omniauth-ldap"
gem 'bootstrap-sass', "2.0.3.1"
gem "colored"
gem 'resque_mailer'
gem 'chosen-rails'

gem "jquery-rails", "2.0.2"
gem "jquery-ui-rails", "0.5.0"
gem "modernizr", "2.5.3"
gem "graphael-rails", "0.1.4"
gem 'tabs_on_rails'
gem 'settingslogic'

group :assets do
gem "sass-rails", "3.2.5"
gem "coffee-rails", "3.2.2"
gem "uglifier", "1.0.3"
gem "therubyracer"

gem 'chosen-rails'
gem "jquery-rails", "2.0.2"
gem "jquery-ui-rails", "0.5.0"
gem "modernizr", "2.5.3"
gem "raphael-rails", "1.5.2"
gem 'bootstrap-sass', "2.0.3.1"
end

group :development do
Expand All @@ -67,7 +71,6 @@ group :development, :test do
gem "awesome_print"
gem "database_cleaner"
gem "launchy"
gem "webmock"
end

group :test do
Expand All @@ -77,4 +80,6 @@ group :test do
gem "simplecov", :require => false
gem "shoulda-matchers"
gem 'email_spec'
gem 'resque_spec'
gem "webmock"
end
72 changes: 49 additions & 23 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ GIT
grit (>= 2.4.1)
hashery (~> 1.4.0)

GIT
remote: https://github.com/gitlabhq/grack.git
revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
specs:
grack (1.0.0)
rack (~> 1.4.1)

GIT
remote: https://github.com/gitlabhq/grit.git
revision: 7f35cb98ff17d534a07e3ce6ec3d580f67402837
Expand All @@ -33,6 +40,17 @@ GIT
mime-types (~> 1.18)
pygments.rb (~> 0.2.11)

GIT
remote: https://github.com/gitlabhq/omniauth-ldap.git
revision: 7edf27d0281e09561838122982c16b7e62181f44
ref: 7edf27d0281e09561838122982c16b7e62181f44
specs:
omniauth-ldap (1.0.2)
net-ldap (~> 0.2.2)
omniauth (~> 1.0)
pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.1.1)

GIT
remote: https://github.com/gitlabhq/pygments.rb.git
revision: 2cada028da5054616634a1d9ca6941b65b3ce188
Expand Down Expand Up @@ -78,8 +96,8 @@ GEM
activesupport (3.2.5)
i18n (~> 0.6)
multi_json (~> 1.0)
acts-as-taggable-on (2.1.1)
rails
acts-as-taggable-on (2.3.1)
rails (~> 3.0)
acts_as_list (0.1.6)
addressable (2.2.8)
ansi (1.4.2)
Expand Down Expand Up @@ -130,10 +148,11 @@ GEM
nokogiri (>= 1.5.0)
daemons (1.1.8)
database_cleaner (0.8.0)
devise (1.5.3)
devise (2.1.2)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
warden (~> 1.1)
orm_adapter (~> 0.1)
railties (~> 3.1)
warden (~> 1.2.1)
diff-lcs (1.1.3)
drapper (0.8.4)
email_spec (1.2.1)
Expand All @@ -151,8 +170,12 @@ GEM
gherkin (2.11.0)
json (>= 1.4.6)
git (1.2.5)
graphael-rails (0.1.4)
jeweler
grape (0.2.0)
hashie (~> 1.2)
multi_json
multi_xml
rack
rack-mount
haml (3.1.6)
haml-rails (0.3.4)
actionpack (~> 3.0)
Expand All @@ -166,11 +189,6 @@ GEM
multi_json (~> 1.0)
multi_xml
i18n (0.6.0)
jeweler (1.8.3)
bundler (~> 1.0)
git (>= 1.2.5)
rake
rdoc
journey (1.0.3)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
Expand Down Expand Up @@ -208,12 +226,7 @@ GEM
omniauth (1.1.0)
hashie (~> 1.2)
rack
omniauth-ldap (1.0.2)
net-ldap (~> 0.2.2)
omniauth (~> 1.0)
pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.1.1)
orm_adapter (0.0.7)
orm_adapter (0.3.0)
polyglot (0.3.3)
posix-spawn (0.3.6)
pry (0.9.9.6)
Expand All @@ -224,6 +237,8 @@ GEM
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-protection (1.2.0)
rack
rack-ssl (1.3.2)
Expand All @@ -249,6 +264,7 @@ GEM
thor (>= 0.14.6, < 2.0)
raindrops (0.9.0)
rake (0.9.2.2)
raphael-rails (1.5.2)
rdoc (3.12)
json (~> 1.4)
redcarpet (2.1.1)
Expand All @@ -263,6 +279,9 @@ GEM
resque_mailer (2.0.3)
actionmailer (>= 3.0.0)
resque (>= 1.2.3)
resque_spec (0.11.0)
resque (>= 1.19.0)
rspec (>= 2.5.0)
rspec (2.10.0)
rspec-core (~> 2.10.0)
rspec-expectations (~> 2.10.0)
Expand Down Expand Up @@ -295,6 +314,7 @@ GEM
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
settingslogic (2.0.8)
shoulda-matchers (1.1.0)
activesupport (>= 3.0.0)
simplecov (0.6.4)
Expand All @@ -313,6 +333,7 @@ GEM
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
stamp (0.1.6)
tabs_on_rails (2.1.1)
therubyracer (0.10.1)
libv8 (~> 3.3.10)
thin (1.3.1)
Expand All @@ -336,7 +357,7 @@ GEM
raindrops (~> 0.7)
vegas (0.1.11)
rack (>= 1.0.0)
warden (1.2.0)
warden (1.2.1)
rack (>= 1.0)
webmock (1.8.7)
addressable (>= 2.2.7)
Expand All @@ -348,7 +369,7 @@ PLATFORMS
ruby

DEPENDENCIES
acts-as-taggable-on (~> 2.1.0)
acts-as-taggable-on (= 2.3.1)
acts_as_list
annotate!
autotest
Expand All @@ -363,14 +384,15 @@ DEPENDENCIES
colored
cucumber-rails
database_cleaner
devise (~> 1.5)
devise (~> 2.1.0)
drapper
email_spec
ffaker
foreman
git
gitolite!
graphael-rails (= 0.1.4)
grack!
grape
grit!
haml-rails
httparty
Expand All @@ -383,22 +405,26 @@ DEPENDENCIES
minitest (>= 2.10)
modernizr (= 2.5.3)
mysql2
omniauth-ldap
omniauth-ldap!
pry
pygments.rb!
rails (= 3.2.5)
rails-footnotes
raphael-rails (= 1.5.2)
redcarpet (~> 2.1.1)
resque (~> 1.20.0)
resque_mailer
resque_spec
rspec-rails
sass-rails (= 3.2.5)
seed-fu
settingslogic
shoulda-matchers
simplecov
six
sqlite3
stamp
tabs_on_rails
therubyracer
thin
turn
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Welcome to GitLab [![build status](https://secure.travis-ci.org/gitlabhq/gitlabhq.png)](https://secure.travis-ci.org/gitlabhq/gitlabhq) [![build status](https://secure.travis-ci.org/gitlabhq/grit.png)](https://secure.travis-ci.org/gitlabhq/grit)
# Welcome to GitLab [![build status](https://secure.travis-ci.org/gitlabhq/gitlabhq.png)](https://secure.travis-ci.org/gitlabhq/gitlabhq) [![build status](https://secure.travis-ci.org/gitlabhq/grit.png)](https://secure.travis-ci.org/gitlabhq/grit) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/gitlabhq/gitlabhq)

GitLab is a free project and repository management application

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.0
2.7.0
Binary file modified app/assets/images/ajax_loader.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/ajax_loader_tree.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/no_avatar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions app/assets/javascripts/admin.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
$(document).ready(function(){
$('input#user_force_random_password').on('change', function(elem) {
var elems = $('#user_password, #user_password_confirmation');

if ($(this).attr('checked')) {
elems.val('').attr('disabled', true);
} else {
elems.removeAttr('disabled');
}
});
});
26 changes: 24 additions & 2 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,35 @@
//= require jquery.cookie
//= require jquery.endless-scroll
//= require jquery.highlight
//= require jquery.waitforimages
//= require bootstrap-modal
//= require modernizr
//= require chosen-jquery
//= require raphael/raphael
//= require raphael
//= require branch-graph
//= require_tree .

$(document).ready(function(){

$(".one_click_select").live("click", function(){
$(this).select();
});


$('body').on('ajax:complete, ajax:beforeSend, submit', 'form', function(e){
var buttons = $('[type="submit"]', this);
switch( e.type ){
case 'ajax:beforeSend':
case 'submit':
buttons.attr('disabled', 'disabled');
break;
case ' ajax:complete':
default:
buttons.removeAttr('disabled');
break;
}
})

$(".account-box").mouseenter(showMenu);
$(".account-box").mouseleave(resetMenu);

Expand Down Expand Up @@ -56,7 +73,7 @@ $(document).ready(function(){

/**
* Commit show suppressed diff
*
*
*/
$(".supp_diff_link").bind("click", function() {
showDiff(this);
Expand Down Expand Up @@ -97,3 +114,8 @@ function showDiff(link) {
return _chosen.apply(this, [default_options]);
}})
})(jQuery);


function ajaxGet(url) {
$.ajax({type: "GET", url: url, dataType: "script"});
}
3 changes: 2 additions & 1 deletion app/assets/javascripts/graph.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
function initGraphNav() {
$("body").keydown(function(e) {
$(".graph svg").css("position", "relative");
$("body").bind("keyup", function(e) {
if(e.keyCode == 37) { // left
$(".graph svg").animate({ left: "+=400" });
} else if(e.keyCode == 39) { // right
Expand Down
Loading