Permalink
Browse files

master merged

  • Loading branch information...
2 parents 77bfc59 + 6104942 commit e6ce47291b3f08ebe18c2450fc4f21a2a3a2b8a9 @AlexDenisov AlexDenisov committed Sep 20, 2012
Showing with 4,220 additions and 2,126 deletions.
  1. +30 −0 CONTRIBUTING.md
  2. +22 −3 Gemfile
  3. +60 −19 Gemfile.lock
  4. +26 −0 Guardfile
  5. +4 −0 app/assets/javascripts/admin.js.coffee
  6. +1 −1 app/assets/javascripts/application.js
  7. +3 −0 app/assets/javascripts/main.js.coffee
  8. +0 −182 app/assets/javascripts/note.js
  9. +293 −0 app/assets/javascripts/notes.js
  10. +5 −1 app/assets/javascripts/projects.js.coffee
  11. +99 −10 app/assets/stylesheets/common.scss
  12. +8 −0 app/assets/stylesheets/gitlab_bootstrap/blocks.scss
  13. +33 −1 app/assets/stylesheets/gitlab_bootstrap/common.scss
  14. +5 −1 app/assets/stylesheets/main.scss
  15. +19 −9 app/assets/stylesheets/ref_select.scss
  16. +28 −27 app/assets/stylesheets/sections/issues.scss
  17. +27 −28 app/assets/stylesheets/sections/merge_requests.scss
  18. +0 −1 app/assets/stylesheets/sections/nav.scss
  19. +19 −10 app/assets/stylesheets/sections/notes.scss
  20. +8 −0 app/assets/stylesheets/sections/profile.scss
  21. +17 −16 app/contexts/notes/load_context.rb
  22. +1 −5 app/controllers/admin/dashboard_controller.rb
  23. +2 −6 app/controllers/admin/hooks_controller.rb
  24. +1 −5 app/controllers/admin/logs_controller.rb
  25. +3 −6 app/controllers/admin/projects_controller.rb
  26. +2 −3 app/controllers/admin/resque_controller.rb
  27. +1 −5 app/controllers/admin/team_members_controller.rb
  28. +6 −10 app/controllers/admin/users_controller.rb
  29. +11 −0 app/controllers/admin_controller.rb
  30. +0 −4 app/controllers/application_controller.rb
  31. +1 −1 app/controllers/commits_controller.rb
  32. +1 −3 app/controllers/issues_controller.rb
  33. +29 −1 app/controllers/omniauth_callbacks_controller.rb
  34. +6 −5 app/controllers/profile_controller.rb
  35. +7 −4 app/controllers/team_members_controller.rb
  36. +1 −1 app/decorators/commit_decorator.rb
  37. +9 −2 app/helpers/application_helper.rb
  38. +3 −1 app/helpers/gitlab_markdown_helper.rb
  39. +17 −0 app/helpers/notes_helper.rb
  40. +7 −0 app/helpers/profile_helper.rb
  41. +4 −0 app/helpers/projects_helper.rb
  42. +1 −1 app/helpers/tab_helper.rb
  43. +2 −1 app/helpers/tree_helper.rb
  44. +22 −14 app/models/event.rb
  45. +1 −1 app/models/issue.rb
  46. +1 −1 app/models/merge_request.rb
  47. +7 −1 app/models/note.rb
  48. +4 −0 app/models/project.rb
  49. +1 −1 app/models/tree.rb
  50. +14 −28 app/models/user.rb
  51. +0 −1 app/models/wiki.rb
  52. +12 −0 app/observers/project_observer.rb
  53. +12 −0 app/observers/user_observer.rb
  54. +2 −2 app/observers/users_project_observer.rb
  55. +0 −6 app/roles/upvote.rb
  56. +32 −0 app/roles/votes.rb
  57. +26 −9 app/views/admin/logs/show.html.haml
  58. +1 −2 app/views/admin/projects/_form.html.haml
  59. +2 −16 app/views/admin/projects/show.html.haml
  60. +4 −2 app/views/admin/resque/show.html.haml
  61. +1 −12 app/views/admin/team_members/_form.html.haml
  62. +2 −16 app/views/admin/users/show.html.haml
  63. +2 −2 app/views/commits/_commit_box.html.haml
  64. +1 −11 app/views/commits/_head.html.haml
  65. +3 −6 app/views/commits/_text_file.html.haml
  66. +1 −1 app/views/commits/show.html.haml
  67. +7 −1 app/views/dashboard/index.html.haml
  68. +1 −1 app/views/devise/sessions/_new_ldap.html.haml
  69. +3 −3 app/views/devise/sessions/new.html.haml
  70. +1 −1 app/views/events/_commit.html.haml
  71. +1 −1 app/views/events/_event_last_push.html.haml
  72. +1 −1 app/views/events/_event_membership_changed.html.haml
  73. +2 −2 app/views/issues/_form.html.haml
  74. +3 −3 app/views/issues/_show.html.haml
  75. +0 −7 app/views/issues/edit.html.haml
  76. +1 −1 app/views/issues/index.html.haml
  77. +0 −7 app/views/issues/new.html.haml
  78. +8 −8 app/views/issues/show.html.haml
  79. +7 −2 app/views/labels/_label.html.haml
  80. +5 −5 app/views/layouts/profile.html.haml
  81. +3 −10 app/views/merge_requests/_form.html.haml
  82. +3 −2 app/views/merge_requests/_merge_request.html.haml
  83. +2 −2 app/views/merge_requests/_show.html.haml
  84. +4 −0 app/views/merge_requests/diffs.html.haml
  85. +3 −0 app/views/merge_requests/diffs.js.haml
  86. +1 −1 app/views/merge_requests/show.js.haml
  87. +1 −1 app/views/merge_requests/show/_mr_box.html.haml
  88. +2 −4 app/views/merge_requests/show/_mr_title.html.haml
  89. +0 −6 app/views/milestones/edit.html.haml
  90. +1 −1 app/views/milestones/show.html.haml
  91. +1 −1 app/views/notes/{_form.html.haml → _common_form.html.haml}
  92. +3 −2 app/views/notes/{_create_common.js.haml → _create_common_note.js.haml}
  93. +0 −8 app/views/notes/_create_line.js.haml
  94. +19 −0 app/views/notes/_create_per_line_note.js.haml
  95. +0 −17 app/views/notes/_load.js.haml
  96. +10 −2 app/views/notes/{_show.html.haml → _note.html.haml}
  97. +3 −12 app/views/notes/_notes.html.haml
  98. +0 −4 app/views/notes/_notes_list.html.haml
  99. +11 −0 app/views/notes/_notes_with_form.html.haml
  100. +5 −0 app/views/notes/_per_line_note.html.haml
  101. +1 −0 app/views/notes/_per_line_note_link.html.haml
  102. +3 −0 app/views/notes/_per_line_notes_with_reply.html.haml
  103. +4 −0 app/views/notes/_per_line_reply_button.html.haml
  104. +0 −5 app/views/notes/_per_line_show.html.haml
  105. +0 −4 app/views/notes/_reply_button.html.haml
  106. +11 −0 app/views/notes/_reversed_notes_with_form.html.haml
  107. +2 −2 app/views/notes/create.js.haml
  108. +17 −1 app/views/notes/index.js.haml
  109. +57 −0 app/views/profile/account.html.haml
  110. +5 −0 app/views/profile/history.html.haml
  111. +0 −19 app/views/profile/password.html.haml
  112. +33 −21 app/views/profile/show.html.haml
  113. +0 −23 app/views/profile/token.html.haml
  114. +2 −2 app/views/projects/_project_head.html.haml
  115. +0 −8 app/views/projects/_refs.html.haml
  116. +3 −3 app/views/projects/edit.html.haml
  117. +1 −1 app/views/projects/wall.html.haml
  118. +1 −4 app/views/protected_branches/index.html.haml
  119. +1 −4 app/views/refs/_head.html.haml
  120. +6 −8 app/views/refs/_tree.html.haml
  121. +1 −1 app/views/refs/_tree_file.html.haml
  122. +0 −5 app/views/refs/blame.html.haml
  123. +1 −1 app/views/repositories/_branch.html.haml
  124. +1 −1 app/views/repositories/_feed.html.haml
  125. +1 −1 app/views/repositories/tags.html.haml
  126. +11 −8 app/views/search/show.html.haml
  127. +5 −0 app/views/shared/_ref_switcher.html.haml
  128. +1 −9 app/views/snippets/_form.html.haml
  129. +1 −1 app/views/snippets/show.html.haml
  130. +4 −11 app/views/team_members/_form.html.haml
  131. +13 −7 app/views/team_members/_show.html.haml
  132. 0 app/views/{projects → team_members}/_team.html.haml
  133. +2 −4 app/views/{projects/team.html.haml → team_members/index.html.haml}
  134. +1 −1 app/views/team_members/show.html.haml
  135. +6 −0 app/views/votes/_votes_block.html.haml
  136. +6 −0 app/views/votes/_votes_inline.html.haml
  137. +1 −1 app/views/wikis/show.html.haml
  138. +0 −8 config/cucumber.yml
  139. +36 −1 config/gitlab.yml.example
  140. +21 −5 config/initializers/1_settings.rb
  141. +17 −0 config/initializers/devise.rb
  142. +0 −15 config/initializers/omniauth.rb.sample
  143. +8 −0 config/initializers/resque.rb
  144. +3 −0 config/resque.yml.example
  145. +55 −53 config/routes.rb
  146. 0 config/{unicorn.rb.orig → unicorn.rb.example}
  147. +1 −0 doc/api/README.md
  148. +79 −0 doc/api/keys.md
  149. +44 −0 doc/api/projects.md
  150. +3 −3 doc/development.md
  151. +16 −2 doc/installation.md
  152. +3 −4 features/dashboard/dashboard.feature
  153. +3 −3 features/dashboard/issues.feature
  154. +4 −4 features/dashboard/merge_requests.feature
  155. +4 −6 features/dashboard/search.feature
  156. +4 −4 features/profile/profile.feature
  157. +5 −8 features/profile/ssh_keys.feature
  158. +9 −6 features/{projects → project}/commits/branches.feature
  159. +3 −3 features/{projects → project}/commits/commit_comments.feature
  160. +4 −5 features/{projects → project}/commits/commits.feature
  161. +5 −4 features/{projects → project}/commits/tags.feature
  162. +1 −1 features/{projects → project}/create_project.feature
  163. +2 −3 features/{projects → project}/issues/issues.feature
  164. +10 −0 features/project/issues/labels.feature
  165. +3 −3 features/{projects → project}/issues/milestones.feature
  166. +3 −3 features/{projects → project}/merge_requests.feature
  167. +2 −3 features/{projects → project}/network.feature
  168. +14 −0 features/project/project.feature
  169. +6 −8 features/{projects → project}/source/browse_files.feature
  170. +10 −0 features/project/source/git_blame.feature
  171. +7 −8 features/{projects → project}/team_management.feature
  172. +5 −6 features/{projects → project}/wall.feature
  173. +3 −3 features/{projects → project}/wiki.feature
  174. 0 features/projects/deploy_keys.feature
  175. +0 −13 features/projects/issues/labels.feature
  176. +0 −11 features/projects/project.feature
  177. 0 features/projects/snippets.feature
  178. +0 −10 features/projects/source/git_blame.feature
  179. 0 features/projects/web_hooks.feature
  180. +0 −21 features/step_definitions/common_steps.rb
  181. +0 −136 features/step_definitions/dashboard_steps.rb
  182. +0 −34 features/step_definitions/profile/profile_keys_steps.rb
  183. +0 −39 features/step_definitions/profile/profile_steps.rb
  184. +0 −38 features/step_definitions/project/browse_code_steps.rb
  185. +0 −64 features/step_definitions/project/project_commits_steps.rb
  186. +0 −81 features/step_definitions/project/project_issues_steps.rb
  187. +0 −38 features/step_definitions/project/project_merge_requests_steps.rb
  188. +0 −33 features/step_definitions/project/project_milestones_steps.rb
  189. +0 −55 features/step_definitions/project/project_team_steps.rb
  190. +0 −14 features/step_definitions/project/project_wiki_steps.rb
  191. +0 −77 features/step_definitions/project/projects_steps.rb
  192. +0 −91 features/step_definitions/visit_steps.rb
  193. +92 −0 features/steps/dashboard/dashboard.rb
  194. +19 −0 features/steps/dashboard/dashboard_issues.rb
  195. +23 −0 features/steps/dashboard/dashboard_merge_requests.rb
  196. +18 −0 features/steps/dashboard/dashboard_search.rb
  197. +44 −0 features/steps/profile/profile.rb
  198. +48 −0 features/steps/profile/profile_ssh_keys.rb
  199. +22 −0 features/steps/project/create_project.rb
  200. +5 −0 features/steps/project/project.rb
  201. +35 −0 features/steps/project/project_browse_branches.rb
  202. +47 −0 features/steps/project/project_browse_commits.rb
  203. +34 −0 features/steps/project/project_browse_files.rb
  204. +19 −0 features/steps/project/project_browse_git_repo.rb
  205. +10 −0 features/steps/project/project_browse_tags.rb
  206. +6 −0 features/steps/project/project_comment_commit.rb
  207. +134 −0 features/steps/project/project_issues.rb
  208. +24 −0 features/steps/project/project_labels.rb
  209. +80 −0 features/steps/project/project_merge_requests.rb
  210. +39 −0 features/steps/project/project_milestones.rb
  211. +22 −0 features/steps/project/project_network_graph.rb
  212. +89 −0 features/steps/project/project_team_management.rb
  213. +6 −0 features/steps/project/project_wall.rb
  214. +20 −0 features/steps/project/project_wiki.rb
  215. +10 −0 features/steps/shared/authentication.rb
  216. +21 −0 features/steps/shared/note.rb
  217. +112 −0 features/steps/shared/paths.rb
  218. +8 −0 features/steps/shared/project.rb
  219. +16 −48 features/support/env.rb
  220. +1 −0 lib/api.rb
  221. +10 −0 lib/api/entities.rb
  222. +36 −3 lib/api/helpers.rb
  223. +9 −21 lib/api/issues.rb
  224. +50 −0 lib/api/keys.rb
  225. +6 −16 lib/api/milestones.rb
  226. +66 −25 lib/api/projects.rb
  227. +11 −0 lib/gitlab/app_logger.rb
  228. +66 −0 lib/gitlab/auth.rb
  229. +8 −4 lib/gitlab/backend/gitolite_config.rb
  230. +8 −7 lib/gitlab/backend/grack_auth.rb
  231. +11 −0 lib/gitlab/git_logger.rb
  232. +3 −1 lib/gitlab/graph_commit.rb
  233. +2 −6 lib/gitlab/logger.rb
  234. +20 −8 lib/gitlab/markdown.rb
  235. +0 −65 lib/tasks/cucumber.rake
  236. +2 −3 lib/tasks/gitlab/test.rake
  237. +1 −1 lib/tasks/travis.rake
  238. +0 −10 script/cucumber
  239. +9 −1 spec/helpers/gitlab_markdown_helper_spec.rb
  240. +95 −0 spec/lib/auth_spec.rb
  241. +20 −21 spec/models/event_spec.rb
  242. +1 −1 spec/models/issue_spec.rb
  243. +1 −1 spec/models/merge_request_spec.rb
  244. +15 −8 spec/models/note_spec.rb
  245. +6 −1 spec/observers/user_observer_spec.rb
  246. +16 −12 spec/observers/users_project_observer_spec.rb
  247. +6 −4 spec/requests/api/issues_spec.rb
  248. +38 −5 spec/requests/api/projects_spec.rb
  249. +73 −0 spec/requests/api/ssh_keys_spec.rb
  250. +6 −4 spec/requests/api/users_spec.rb
  251. +13 −32 spec/requests/atom/dashboard_issues_spec.rb
  252. +12 −18 spec/requests/atom/dashboard_spec.rb
  253. +25 −31 spec/requests/atom/issues_spec.rb
  254. +1 −0 spec/requests/gitlab_flavored_markdown_spec.rb
  255. +2 −2 spec/requests/security/profile_access_spec.rb
  256. +1 −1 spec/requests/security/project_access_spec.rb
  257. +0 −27 spec/roles/upvote_spec.rb
  258. +132 −0 spec/roles/votes_spec.rb
  259. +166 −0 spec/routing/admin_routing_spec.rb
  260. +398 −0 spec/routing/project_routing_spec.rb
  261. +186 −0 spec/routing/routing_spec.rb
  262. +4 −30 spec/support/gitolite_stub.rb
  263. +1 −5 spec/support/matchers.rb
  264. BIN vendor/assets/images/authbuttons/github_32.png
  265. BIN vendor/assets/images/authbuttons/github_64.png
  266. BIN vendor/assets/images/authbuttons/google_32.png
  267. BIN vendor/assets/images/authbuttons/google_64.png
  268. BIN vendor/assets/images/authbuttons/twitter_32.png
  269. BIN vendor/assets/images/authbuttons/twitter_64.png
View
@@ -0,0 +1,30 @@
+## Contribute to GitLab
+
+If you want to contribute to GitLab, follow this process:
+
+1. Fork the project
+2. Create a feature branch
+3. Code
+4. Create a pull request
+
+We only accept pull requests if:
+
+* Your code has proper tests and all tests pass
+* Your code can be merged w/o problems
+* It wont broke existing functionality
+* Its a quality code
+* We like it :)
+
+## [You may need a developer VM](https://github.com/gitlabhq/developer-vm)
+
+## Running tests
+
+To run the specs for GitLab, you need to run seeds for test db.
+
+ cd gitlabhq
+ rake db:seed_fu RAILS_ENV=test
+
+Then you can run the test suite with rake:
+
+ rake gitlab:test
+
View
25 Gemfile
@@ -1,5 +1,13 @@
source "http://rubygems.org"
+def darwin_only(require_as)
+ RUBY_PLATFORM.include?('darwin') && require_as
+end
+
+def linux_only(require_as)
+ RUBY_PLATFORM.include?('linux') && require_as
+end
+
gem "rails", "3.2.8"
# Supported DBs
@@ -8,6 +16,10 @@ gem "mysql2"
# Auth
gem "devise", "~> 2.1.0"
+gem 'omniauth'
+gem 'omniauth-google-oauth2'
+gem 'omniauth-twitter'
+gem 'omniauth-github'
# GITLAB patched libs
gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
@@ -98,21 +110,28 @@ group :development do
end
group :development, :test do
+ gem 'spinach-rails'
gem "rspec-rails"
gem "capybara"
gem "capybara-webkit"
gem "headless"
- gem "autotest"
- gem "autotest-rails"
gem "pry"
gem "awesome_print"
gem "database_cleaner"
gem "launchy"
gem 'factory_girl_rails'
+
+ # Guard
+ gem 'guard-rspec'
+ gem 'guard-spinach'
+
+ # Notification
+ gem 'rb-fsevent', :require => darwin_only('rb-fsevent')
+ gem 'growl', :require => darwin_only('growl')
+ gem 'rb-inotify', :require => linux_only('rb-inotify')
end
group :test do
- gem 'cucumber-rails', :require => false
gem "simplecov", :require => false
gem "shoulda-matchers"
gem 'email_spec'
View
@@ -68,7 +68,6 @@ GIT
GEM
remote: http://rubygems.org/
specs:
- ZenTest (4.8.1)
actionmailer (3.2.8)
actionpack (= 3.2.8)
mail (~> 2.4.4)
@@ -100,10 +99,6 @@ GEM
rails (~> 3.0)
addressable (2.2.8)
arel (3.0.2)
- autotest (4.4.6)
- ZenTest (>= 4.4.1)
- autotest-rails (4.1.2)
- ZenTest (~> 4.5)
awesome_print (1.0.2)
bcrypt-ruby (3.0.1)
blankslate (2.1.2.4)
@@ -137,16 +132,8 @@ GEM
execjs
coffee-script-source (1.3.3)
colored (1.2)
+ colorize (0.5.8)
crack (0.3.1)
- cucumber (1.2.1)
- builder (>= 2.1.2)
- diff-lcs (>= 1.1.3)
- gherkin (~> 2.11.0)
- json (>= 1.4.6)
- cucumber-rails (1.3.0)
- capybara (>= 1.1.2)
- cucumber (>= 1.1.8)
- nokogiri (>= 1.5.0)
daemons (1.1.8)
database_cleaner (0.8.0)
devise (2.1.2)
@@ -171,12 +158,13 @@ GEM
factory_girl_rails (4.0.0)
factory_girl (~> 4.0.0)
railties (>= 3.0.0)
+ faraday (0.8.4)
+ multipart-post (~> 1.1)
ffaker (1.14.0)
ffi (1.0.11)
foreman (0.47.0)
thor (>= 0.13.6)
- gherkin (2.11.0)
- json (>= 1.4.6)
+ gherkin-ruby (0.2.1)
git (1.2.5)
github-markup (0.7.4)
gitlab_meta (2.9)
@@ -186,6 +174,15 @@ GEM
multi_xml
rack
rack-mount
+ growl (1.0.3)
+ guard (1.3.2)
+ listen (>= 0.4.2)
+ thor (>= 0.14.6)
+ guard-rspec (1.2.1)
+ guard (>= 1.1)
+ guard-spinach (0.0.2)
+ guard (>= 1.1)
+ spinach
haml (3.1.6)
haml-rails (0.3.4)
actionpack (~> 3.0)
@@ -199,6 +196,7 @@ GEM
httparty (0.8.3)
multi_json (~> 1.0)
multi_xml
+ httpauth (0.1)
i18n (0.6.1)
journey (1.0.4)
jquery-rails (2.0.2)
@@ -208,6 +206,8 @@ GEM
jquery-rails
railties (>= 3.1.0)
json (1.7.5)
+ jwt (0.1.5)
+ multi_json (>= 1.0)
kaminari (0.14.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
@@ -219,6 +219,7 @@ GEM
libv8 (3.3.10.4)
libwebsocket (0.1.3)
addressable
+ listen (0.5.0)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -229,12 +230,35 @@ GEM
sprockets (~> 2.0)
multi_json (1.3.6)
multi_xml (0.5.1)
+ multipart-post (1.1.5)
mysql2 (0.3.11)
net-ldap (0.2.2)
nokogiri (1.5.3)
+ oauth (0.4.7)
+ oauth2 (0.8.0)
+ faraday (~> 0.8)
+ httpauth (~> 0.1)
+ jwt (~> 0.1.4)
+ multi_json (~> 1.0)
+ rack (~> 1.2)
omniauth (1.1.0)
hashie (~> 1.2)
rack
+ omniauth-github (1.0.3)
+ omniauth (~> 1.0)
+ omniauth-oauth2 (~> 1.1)
+ omniauth-google-oauth2 (0.1.13)
+ omniauth (~> 1.0)
+ omniauth-oauth2
+ omniauth-oauth (1.0.1)
+ oauth
+ omniauth (~> 1.0)
+ omniauth-oauth2 (1.1.0)
+ oauth2 (~> 0.8.0)
+ omniauth (~> 1.0)
+ omniauth-twitter (0.0.13)
+ multi_json (~> 1.3)
+ omniauth-oauth (~> 1.0)
orm_adapter (0.3.0)
polyglot (0.3.3)
posix-spawn (0.3.6)
@@ -274,6 +298,9 @@ GEM
raindrops (0.9.0)
rake (0.9.2.2)
raphael-rails (1.5.2)
+ rb-fsevent (0.9.1)
+ rb-inotify (0.8.8)
+ ffi (>= 0.5.0)
rdoc (3.12)
json (~> 1.4)
redcarpet (2.1.1)
@@ -336,6 +363,13 @@ GEM
tilt (~> 1.3, >= 1.3.3)
six (0.2.0)
slop (2.4.4)
+ spinach (0.5.2)
+ colorize
+ gherkin-ruby (~> 0.2.0)
+ spinach-rails (0.1.8)
+ capybara (~> 1)
+ railties (>= 3)
+ spinach (>= 0.4)
sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
@@ -378,8 +412,6 @@ PLATFORMS
DEPENDENCIES
acts-as-taggable-on (= 2.3.1)
annotate!
- autotest
- autotest-rails
awesome_print
bootstrap-sass (= 2.0.4)
capybara
@@ -389,7 +421,6 @@ DEPENDENCIES
chosen-rails
coffee-rails (= 3.2.2)
colored
- cucumber-rails
database_cleaner
devise (~> 2.1.0)
draper
@@ -404,6 +435,9 @@ DEPENDENCIES
grack!
grape (~> 0.2.1)
grit!
+ growl
+ guard-rspec
+ guard-spinach
haml-rails
headless
httparty
@@ -415,12 +449,18 @@ DEPENDENCIES
linguist (~> 1.0.0)!
modernizr (= 2.5.3)
mysql2
+ omniauth
+ omniauth-github
+ omniauth-google-oauth2
omniauth-ldap!
+ omniauth-twitter
pry
pygments.rb!
rack-mini-profiler
rails (= 3.2.8)
raphael-rails (= 1.5.2)
+ rb-fsevent
+ rb-inotify
redcarpet (~> 2.1.1)
resque (~> 1.20.0)
resque_mailer
@@ -432,6 +472,7 @@ DEPENDENCIES
shoulda-matchers
simplecov
six
+ spinach-rails
sqlite3
stamp
test_after_commit
View
@@ -0,0 +1,26 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+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('spec/spec_helper.rb') { "spec" }
+
+ # Rails example
+ watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" }
+ watch(%r{^app/(.*)(\.erb|\.haml)$}) { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+ watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+ watch(%r{^spec/support/(.+)\.rb$}) { "spec" }
+ watch('config/routes.rb') { "spec/routing" }
+ watch('app/controllers/application_controller.rb') { "spec/controllers" }
+
+ # Capybara request specs
+ watch(%r{^app/views/(.+)/.*\.(erb|haml)$}) { |m| "spec/requests/#{m[1]}_spec.rb" }
+end
+
+guard 'spinach' do
+ watch(%r|^features/(.*)\.feature|)
+ watch(%r|^features/steps/(.*)([^/]+)\.rb|) do |m|
+ "features/#{m[1]}#{m[2]}.feature"
+ end
+end
@@ -6,3 +6,7 @@ $ ->
elems.val('').attr 'disabled', true
else
elems.removeAttr 'disabled'
+
+ $('.log-tabs a').click (e) ->
+ e.preventDefault()
+ $(this).tab('show')
@@ -11,7 +11,7 @@
//= require jquery.endless-scroll
//= require jquery.highlight
//= require jquery.waitforimages
-//= require bootstrap-modal
+//= require bootstrap
//= require modernizr
//= require chosen-jquery
//= require raphael
@@ -24,6 +24,9 @@ $ ->
# Click a .one_click_select field, select the contents
$(".one_click_select").live 'click', -> $(this).select()
+ # Initialize chosen selects
+ $('select.chosen').chosen()
+
# Disable form buttons while a form is submitting
$('body').on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) ->
buttons = $('[type="submit"]', this)
Oops, something went wrong.

0 comments on commit e6ce472

Please sign in to comment.