GitLab

Created by: mreynolds

[email protected]:~/gitlab$ git pull remote: Counting objects: 2609, done. remote: Compressing objects: 100% (887/887), done. remote: Total 2310 (delta 1706), reused 1963 (delta 1399) Receiving objects: 100% (2310/2310), 312.21 KiB | 173 KiB/s, done. Resolving deltas: 100% (1706/1706), completed with 162 local objects. From git://github.com/gitlabhq/gitlabhq 98b84166..9267cb04 master -> origin/master

• [new branch] cucumber -> origin/cucumber
• [new branch] inline_diff -> origin/inline_diff
• [new branch] models_refactoring -> origin/models_refactoring
• [new branch] remove_link_to_function -> origin/remove_link_to_function cc836914..666cdb22 stable -> origin/stable
• [new branch] sys_hooks -> origin/sys_hooks
• [new tag] v2.6.3 -> v2.6.3 From git://github.com/gitlabhq/gitlabhq
• [new tag] v2.6.0 -> v2.6.0
• [new tag] v2.6.1 -> v2.6.1
• [new tag] v2.6.2 -> v2.6.2
• [new tag] v2.7.0pre -> v2.7.0pre Updating 98b84166..9267cb04 Fast-forward .gitignore | 1 + .travis.yml | 2 +- CHANGELOG | 19 + Gemfile | 49 +- Gemfile.lock | 206 +++++---- README.md | 2 +- VERSION | 2 +- app/assets/images/ajax_loader.gif | Bin 7542 -> 7927 bytes app/assets/images/ajax_loader_tree.gif | Bin 0 -> 6531 bytes app/assets/images/logo_text_tr.png | Bin 0 -> 3290 bytes app/assets/images/no_avatar.png | Bin 1335 -> 1337 bytes app/assets/javascripts/admin.js | 11 + app/assets/javascripts/application.js | 32 +- app/assets/javascripts/graph.js | 3 +- app/assets/javascripts/issues.js | 60 +++ app/assets/javascripts/merge_requests.js | 55 ++- app/assets/javascripts/note.js | 4 +- app/assets/stylesheets/common.scss | 480 +++++--------------- app/assets/stylesheets/gitlab_bootstrap.scss | 322 ++++++++++++- app/assets/stylesheets/header.scss | 231 ++++++++++ .../{highlight.black.scss => highlight/dark.scss} | 10 +- .../{highlight.scss => highlight/white.scss} | 11 +- app/assets/stylesheets/main.scss | 54 ++- app/assets/stylesheets/nav.scss | 98 ++++ app/assets/stylesheets/notes.scss | 49 +- app/assets/stylesheets/sections/commits.scss | 43 +- app/assets/stylesheets/sections/graph.scss | 23 + app/assets/stylesheets/sections/issues.scss | 15 + .../stylesheets/sections/merge_requests.scss | 96 ++++ app/assets/stylesheets/sections/tree.scss | 96 ++++ app/assets/stylesheets/themes/ui_basic.scss | 18 + app/assets/stylesheets/{ => themes}/ui_mars.scss | 49 +- app/assets/stylesheets/themes/ui_modern.scss | 69 +++ app/assets/stylesheets/tree.scss | 228 ---------- app/assets/stylesheets/ui_basic.scss | 122 ----- app/contexts/base_context.rb | 8 + app/contexts/commit_load.rb | 26 ++ app/contexts/merge_requests_load.rb | 16 + app/contexts/notes_load.rb | 30 ++ app/controllers/admin/hooks_controller.rb | 44 ++ app/controllers/admin/logs_controller.rb | 6 + app/controllers/admin/mailer_controller.rb | 45 -- app/controllers/admin/projects_controller.rb | 6 +- app/controllers/admin/resque_controller.rb | 5 + app/controllers/admin/users_controller.rb | 3 +- app/controllers/application_controller.rb | 12 +- app/controllers/commits_controller.rb | 57 +-- app/controllers/dashboard_controller.rb | 18 +- app/controllers/hooks_controller.rb | 12 +- app/controllers/issues_controller.rb | 45 +- app/controllers/merge_requests_controller.rb | 85 ++-- app/controllers/notes_controller.rb | 21 +- app/controllers/omniauth_callbacks_controller.rb | 13 + app/controllers/projects_controller.rb | 45 +- app/controllers/refs_controller.rb | 23 +- app/controllers/repositories_controller.rb | 24 +- app/controllers/snippets_controller.rb | 12 +- app/decorators/commit_decorator.rb | 4 - app/decorators/event_decorator.rb | 25 + app/decorators/milestone_decorator.rb | 4 - app/helpers/application_helper.rb | 60 ++- app/helpers/commits_helper.rb | 16 +- app/helpers/issues_helper.rb | 11 + app/helpers/merge_requests_helper.rb | 18 + app/helpers/tree_helper.rb | 27 ++ app/mailers/notify.rb | 7 +- app/models/commit.rb | 24 + app/models/event.rb | 17 +- app/models/event/push_trait.rb | 92 ---- app/models/issue.rb | 53 ++- app/models/key.rb | 30 +- app/models/mailer_observer.rb | 93 ---- app/models/merge_request.rb | 61 ++- app/models/milestone.rb | 14 + app/models/note.rb | 18 +- app/models/project.rb | 138 ++++-- app/models/project/hooks_trait.rb | 109 ----- app/models/project/permissions_trait.rb | 60 --- app/models/project/repository_trait.rb | 122 ----- app/models/project/validations_trait.rb | 43 -- app/models/project_hook.rb | 3 + app/models/protected_branch.rb | 4 +- app/models/snippet.rb | 10 +- app/models/system_hook.rb | 13 + app/models/user.rb | 95 ++-- app/models/users_project.rb | 14 +- app/models/web_hook.rb | 13 +- app/models/wiki.rb | 6 +- app/{models => observers}/activity_observer.rb | 0 app/observers/issue_observer.rb | 25 + app/{models => observers}/key_observer.rb | 0 app/observers/mailer_observer.rb | 79 ++++ app/{models => observers}/project_observer.rb | 0 app/observers/system_hook_observer.rb | 67 +++ app/observers/user_observer.rb | 5 + app/roles/account.rb | 62 +++ app/roles/authority.rb | 58 +++ app/roles/git_merge.rb | 2 + app/roles/git_push.rb | 105 +++++ app/roles/push_event.rb | 98 ++++ app/roles/repository.rb | 152 +++++++ app/roles/ssh_key.rb | 18 + app/roles/team.rb | 10 + app/roles/upvote.rb | 6 + app/views/admin/dashboard/index.html.haml | 2 +- app/views/admin/hooks/_data_ex.html.erb | 45 ++ app/views/admin/hooks/index.html.haml | 39 ++ app/views/admin/logs/show.html.haml | 9 + app/views/admin/mailer/preview.html.haml | 28 -- app/views/admin/projects/_form.html.haml | 2 +- app/views/admin/projects/index.html.haml | 10 +- app/views/admin/resque/show.html.haml | 2 + app/views/admin/users/_form.html.haml | 21 +- app/views/admin/users/index.html.haml | 7 +- app/views/commits/_commit.html.haml | 6 +- app/views/commits/_commit_box.html.haml | 43 ++ app/views/commits/_commits.html.haml | 4 +- app/views/commits/_diffs.html.haml | 16 +- app/views/commits/_head.html.haml | 4 +- app/views/commits/_text_file.html.haml | 4 +- app/views/commits/compare.html.haml | 2 +- app/views/commits/huge_commit.html.haml | 3 + app/views/commits/show.html.haml | 34 +- .../{projects => dashboard}/index.atom.builder | 13 +- app/views/{projects => dashboard}/index.html.haml | 25 +- app/views/dashboard/index.js.haml | 2 + app/views/dashboard/issues.html.haml | 8 +- app/views/dashboard/merge_requests.html.haml | 5 +- app/views/devise/sessions/_new_ldap.html.erb | 39 ++ app/views/devise/sessions/new.html.erb | 41 +- app/views/events/_event.html.haml | 13 +- app/views/events/_event_issue.html.haml | 4 +- app/views/events/_event_last_push.html.haml | 13 + app/views/events/_event_merge_request.html.haml | 4 +- app/views/events/_event_push.html.haml | 3 +- app/views/help/api.html.haml | 41 ++ app/views/help/index.html.haml | 18 +- app/views/help/permissions.html.haml | 3 + app/views/help/system_hooks.html.haml | 13 + app/views/help/web_hooks.html.haml | 14 +- app/views/help/workflow.html.haml | 3 + app/views/hooks/_data_ex.html.erb | 3 +- app/views/issues/_form.html.haml | 28 +- app/views/issues/_issues.html.haml | 11 +- app/views/issues/_show.html.haml | 40 +- app/views/issues/index.html.haml | 103 ++--- app/views/issues/index.js.haml | 1 - app/views/issues/show.html.haml | 17 +- app/views/keys/index.html.haml | 12 +- app/views/keys/new.html.haml | 4 +- app/views/keys/show.html.haml | 2 +- app/views/layouts/_app_menu.html.haml | 30 +- app/views/layouts/_project_menu.html.haml | 44 +- app/views/layouts/admin.html.haml | 19 +- .../{devise.html.haml => devise_layout.html.haml} | 0 app/views/layouts/profile.html.haml | 25 +- app/views/merge_requests/_diffs.html.haml | 3 - app/views/merge_requests/_form.html.haml | 65 ++- app/views/merge_requests/_merge_request.html.haml | 25 +- app/views/merge_requests/_show.html.haml | 39 ++ app/views/merge_requests/diffs.html.haml | 2 + app/views/merge_requests/diffs.js.haml | 2 +- app/views/merge_requests/edit.html.haml | 2 +- app/views/merge_requests/index.html.haml | 5 +- app/views/merge_requests/new.html.haml | 2 +- app/views/merge_requests/show.html.haml | 140 +----- app/views/merge_requests/show.js.haml | 2 + .../merge_requests/{ => show}/_commits.html.haml | 8 +- app/views/merge_requests/show/_diffs.html.haml | 8 + .../{ => show}/_how_to_merge.html.haml | 0 app/views/merge_requests/show/_mr_accept.html.haml | 42 ++ app/views/merge_requests/show/_mr_box.html.haml | 32 ++ app/views/merge_requests/show/_mr_title.html.haml | 33 ++ app/views/milestones/_milestone.html.haml | 8 +- app/views/milestones/index.html.haml | 4 +- app/views/milestones/show.html.haml | 6 +- app/views/notes/_form.html.haml | 2 +- app/views/notes/_per_line_form.html.haml | 2 +- app/views/notes/_reply_button.html.haml | 1 + app/views/notes/_show.html.haml | 7 +- app/views/profile/design.html.haml | 4 + app/views/profile/password.html.haml | 5 +- app/views/profile/show.html.haml | 4 +- app/views/profile/token.html.haml | 11 +- app/views/projects/_form.html.haml | 9 +- app/views/projects/_new_form.html.haml | 2 +- app/views/projects/create.js.haml | 5 +- app/views/projects/edit.html.haml | 2 +- app/views/projects/graph.html.haml | 2 +- app/views/projects/index.js.haml | 2 - app/views/projects/new.html.haml | 2 +- app/views/projects/show.html.haml | 34 +- app/views/projects/team.html.haml | 6 +- app/views/refs/_tree.html.haml | 29 +- app/views/refs/_tree_commit.html.haml | 3 + app/views/refs/_tree_file.html.haml | 35 +- app/views/refs/_tree_item.html.haml | 30 +- app/views/refs/blame.html.haml | 11 +- app/views/refs/logs_tree.js.haml | 9 + app/views/refs/tree.js.haml | 6 + app/views/search/show.html.haml | 107 +++-- app/views/snippets/_snippet.html.haml | 12 +- app/views/snippets/index.html.haml | 13 +- app/views/snippets/show.html.haml | 18 +- app/views/team_members/_show.html.haml | 2 +- app/views/wikis/show.html.haml | 6 +- app/workers/post_receive.rb | 10 +- app/workers/system_hook_worker.rb | 7 + config/application.rb | 9 +- config/cucumber.yml | 8 + config/database.yml.example | 29 +- config/database.yml.mysql | 31 +- config/database.yml.sqlite | 24 +- config/gitlab.yml.example | 40 +- config/initializers/00_before_all.rb | 3 - config/initializers/1_settings.rb | 115 +++++ config/initializers/2_app.rb | 8 + .../{gitlabhq/20_grit_ext.rb => 3_grit_ext.rb} | 4 +- .../30_resque_queues.rb => 4_resque_queues.rb} | 0 config/initializers/connection_fix.rb | 21 +- config/initializers/devise.rb | 18 +- config/initializers/grack_auth.rb | 54 +++ config/initializers/resque_authentication.rb | 14 + config/initializers/resque_mailer.rb | 1 + config/locales/devise.en.yml | 8 +- config/routes.rb | 107 ++++- db/migrate/20110913200833_devise_create_users.rb | 46 +- .../20120627145613_remove_critical_from_issue.rb | 9 + db/migrate/20120706065612_add_lockable_to_users.rb | 6 + db/migrate/20120712080407_add_type_to_web_hook.rb | 5 + db/schema.rb | 14 +- doc/api/README.md | 29 ++ doc/api/projects.md | 270 +++++++++++ doc/api/users.md | 90 ++++ doc/debian_ubuntu.sh | 2 +- doc/installation.md | 30 +- features/dashboard/dashboard.feature | 18 + features/dashboard/search.feature | 11 + features/profile/profile.feature | 18 + features/profile/ssh_keys.feature | 22 + features/projects/commits/branches.feature | 13 + features/projects/commits/commit_comments.feature | 7 + features/projects/commits/commits.feature | 22 + features/projects/commits/tags.feature | 11 + features/projects/create_project.feature | 11 + .../projects/deploy_keys.feature | 0 features/projects/issues/issues.feature | 12 + features/projects/network.feature | 12 + .../projects/source/browse_files.feature.commented | 23 + features/projects/team_management.feature | 35 ++ features/projects/wall.feature | 17 + features/projects/wiki.feature | 9 + features/step_definitions/browse_code_steps.rb | 40 ++ features/step_definitions/dashboard_steps.rb | 67 +++ features/step_definitions/profile_keys_steps.rb | 34 ++ features/step_definitions/profile_steps.rb | 38 ++ features/step_definitions/project_commits_steps.rb | 61 +++ features/step_definitions/project_issues_steps.rb | 22 + features/step_definitions/project_team_steps.rb | 63 +++ features/step_definitions/project_wiki_steps.rb | 18 + features/step_definitions/projects_steps.rb | 68 +++ features/support/env.rb | 67 +++ lib/api.rb | 19 + lib/api/entities.rb | 33 ++ lib/api/helpers.rb | 11 + lib/api/projects.rb | 144 ++++++ lib/api/users.rb | 36 ++ lib/color.rb | 2 + lib/gitlab/encode.rb | 3 +- lib/gitlab/git_host.rb | 8 +- lib/gitlab/gitolite.rb | 2 +- lib/gitlab/inline_diff.rb | 68 +++ lib/gitlab/logger.rb | 22 +- lib/gitlab/theme.rb | 15 + lib/graph_commit.rb | 87 +++- lib/redcarpet/render/gitlab_html.rb | 6 +- lib/tasks/cucumber.rake | 65 +++ lib/tasks/gitlab/backup.rake | 190 ++++++++ lib/tasks/gitlab/status.rake | 14 +- lib/tasks/gitlab/test.rake | 5 + lib/tasks/travis.rake | 2 +- resque.sh | 2 +- resque_dev.sh | 2 +- script/cucumber | 10 + spec/api/projects_spec.rb | 94 ++++ spec/api/users_spec.rb | 37 ++ spec/factories.rb | 12 +- spec/mailers/notify_spec.rb | 28 +- spec/models/activity_observer_spec.rb | 16 +- spec/models/event_spec.rb | 9 +- spec/models/issue_observer_spec.rb | 144 ++++++ spec/models/issue_spec.rb | 84 +++- spec/models/key_spec.rb | 10 +- spec/models/merge_request_spec.rb | 19 +- spec/models/milestone_spec.rb | 14 + spec/models/note_spec.rb | 29 +- spec/models/project_hooks_spec.rb | 30 +- spec/models/project_spec.rb | 45 +- spec/models/protected_branch_spec.rb | 4 +- spec/models/snippet_spec.rb | 10 +- spec/models/system_hook_spec.rb | 63 +++ spec/models/user_observer_spec.rb | 26 ++ spec/models/user_spec.rb | 36 +- spec/models/users_project_spec.rb | 12 +- spec/models/web_hook_spec.rb | 28 +- spec/models/wiki_spec.rb | 15 +- spec/requests/admin/admin_hooks_spec.rb | 53 +++ spec/requests/admin/admin_projects_spec.rb | 1 + spec/requests/admin/admin_users_spec.rb | 21 +- spec/requests/admin/security_spec.rb | 8 +- spec/requests/dashboard_spec.rb | 39 ++ spec/requests/hooks_spec.rb | 7 +- spec/requests/issues_spec.rb | 20 +- spec/requests/last_push_widget_spec.rb | 52 +++ spec/requests/projects_security_spec.rb | 16 +- spec/requests/projects_spec.rb | 38 +- spec/requests/projects_tree_perfomance_spec.rb | 36 -- spec/requests/top_panel_spec.rb | 37 -- spec/spec_helper.rb | 5 + spec/support/api.rb | 7 + spec/workers/post_receive_spec.rb | 4 +- vendor/assets/javascripts/branch-graph.js | 6 +- vendor/assets/javascripts/jquery.waitforimages.js | 144 ++++++ 323 files changed, 7364 insertions(+), 2970 deletions(-) create mode 100644 app/assets/images/ajax_loader_tree.gif create mode 100644 app/assets/images/logo_text_tr.png create mode 100644 app/assets/javascripts/admin.js create mode 100644 app/assets/stylesheets/header.scss rename app/assets/stylesheets/{highlight.black.scss => highlight/dark.scss} (91%) rename app/assets/stylesheets/{highlight.scss => highlight/white.scss} (92%) create mode 100644 app/assets/stylesheets/nav.scss create mode 100644 app/assets/stylesheets/sections/graph.scss create mode 100644 app/assets/stylesheets/sections/merge_requests.scss create mode 100644 app/assets/stylesheets/sections/tree.scss create mode 100644 app/assets/stylesheets/themes/ui_basic.scss rename app/assets/stylesheets/{ => themes}/ui_mars.scss (71%) create mode 100644 app/assets/stylesheets/themes/ui_modern.scss delete mode 100644 app/assets/stylesheets/tree.scss delete mode 100644 app/assets/stylesheets/ui_basic.scss create mode 100644 app/contexts/base_context.rb create mode 100644 app/contexts/commit_load.rb create mode 100644 app/contexts/merge_requests_load.rb create mode 100644 app/contexts/notes_load.rb create mode 100644 app/controllers/admin/hooks_controller.rb create mode 100644 app/controllers/admin/logs_controller.rb delete mode 100644 app/controllers/admin/mailer_controller.rb create mode 100644 app/controllers/admin/resque_controller.rb create mode 100644 app/decorators/event_decorator.rb delete mode 100644 app/decorators/milestone_decorator.rb create mode 100644 app/helpers/tree_helper.rb delete mode 100644 app/models/event/push_trait.rb delete mode 100644 app/models/mailer_observer.rb delete mode 100644 app/models/project/hooks_trait.rb delete mode 100644 app/models/project/permissions_trait.rb delete mode 100644 app/models/project/repository_trait.rb delete mode 100644 app/models/project/validations_trait.rb create mode 100644 app/models/project_hook.rb create mode 100644 app/models/system_hook.rb rename app/{models => observers}/activity_observer.rb (100%) create mode 100644 app/observers/issue_observer.rb rename app/{models => observers}/key_observer.rb (100%) create mode 100644 app/observers/mailer_observer.rb rename app/{models => observers}/project_observer.rb (100%) create mode 100644 app/observers/system_hook_observer.rb create mode 100644 app/observers/user_observer.rb create mode 100644 app/roles/account.rb create mode 100644 app/roles/authority.rb create mode 100644 app/roles/git_merge.rb create mode 100644 app/roles/git_push.rb create mode 100644 app/roles/push_event.rb create mode 100644 app/roles/repository.rb create mode 100644 app/roles/ssh_key.rb create mode 100644 app/roles/team.rb create mode 100644 app/roles/upvote.rb create mode 100644 app/views/admin/hooks/_data_ex.html.erb create mode 100644 app/views/admin/hooks/index.html.haml create mode 100644 app/views/admin/logs/show.html.haml delete mode 100644 app/views/admin/mailer/preview.html.haml create mode 100644 app/views/admin/resque/show.html.haml create mode 100644 app/views/commits/_commit_box.html.haml create mode 100644 app/views/commits/huge_commit.html.haml rename app/views/{projects => dashboard}/index.atom.builder (70%) rename app/views/{projects => dashboard}/index.html.haml (62%) create mode 100644 app/views/dashboard/index.js.haml create mode 100644 app/views/devise/sessions/_new_ldap.html.erb create mode 100644 app/views/events/_event_last_push.html.haml create mode 100644 app/views/help/api.html.haml create mode 100644 app/views/help/system_hooks.html.haml rename app/views/layouts/{devise.html.haml => devise_layout.html.haml} (100%) delete mode 100644 app/views/merge_requests/_diffs.html.haml create mode 100644 app/views/merge_requests/_show.html.haml create mode 100644 app/views/merge_requests/diffs.html.haml create mode 100644 app/views/merge_requests/show.js.haml rename app/views/merge_requests/{ => show}/_commits.html.haml (82%) create mode 100644 app/views/merge_requests/show/_diffs.html.haml rename app/views/merge_requests/{ => show}/_how_to_merge.html.haml (100%) create mode 100644 app/views/merge_requests/show/_mr_accept.html.haml create mode 100644 app/views/merge_requests/show/_mr_box.html.haml create mode 100644 app/views/merge_requests/show/_mr_title.html.haml delete mode 100644 app/views/projects/index.js.haml create mode 100644 app/views/refs/_tree_commit.html.haml create mode 100644 app/views/refs/logs_tree.js.haml create mode 100644 app/workers/system_hook_worker.rb create mode 100644 config/cucumber.yml delete mode 100644 config/initializers/00_before_all.rb create mode 100644 config/initializers/1_settings.rb create mode 100644 config/initializers/2_app.rb rename config/initializers/{gitlabhq/20_grit_ext.rb => 3_grit_ext.rb} (78%) rename config/initializers/{gitlabhq/30_resque_queues.rb => 4_resque_queues.rb} (100%) create mode 100644 config/initializers/grack_auth.rb create mode 100644 config/initializers/resque_authentication.rb create mode 100644 config/initializers/resque_mailer.rb create mode 100644 db/migrate/20120627145613_remove_critical_from_issue.rb create mode 100644 db/migrate/20120706065612_add_lockable_to_users.rb create mode 100644 db/migrate/20120712080407_add_type_to_web_hook.rb create mode 100644 doc/api/README.md create mode 100644 doc/api/projects.md create mode 100644 doc/api/users.md create mode 100644 features/dashboard/dashboard.feature create mode 100644 features/dashboard/search.feature create mode 100644 features/profile/profile.feature create mode 100644 features/profile/ssh_keys.feature create mode 100644 features/projects/commits/branches.feature create mode 100644 features/projects/commits/commit_comments.feature create mode 100644 features/projects/commits/commits.feature create mode 100644 features/projects/commits/tags.feature create mode 100644 features/projects/create_project.feature rename spec/support/security.rb => features/projects/deploy_keys.feature (100%) create mode 100644 features/projects/issues/issues.feature create mode 100644 features/projects/issues/milestones.feature create mode 100644 features/projects/merge_requests.feature create mode 100644 features/projects/network.feature create mode 100644 features/projects/snippets.feature create mode 100644 features/projects/source/browse_files.feature.commented create mode 100644 features/projects/source/git_blame.feature create mode 100644 features/projects/team_management.feature create mode 100644 features/projects/wall.feature create mode 100644 features/projects/web_hooks.feature create mode 100644 features/projects/wiki.feature create mode 100644 features/step_definitions/browse_code_steps.rb create mode 100644 features/step_definitions/dashboard_steps.rb create mode 100644 features/step_definitions/profile_keys_steps.rb create mode 100644 features/step_definitions/profile_steps.rb create mode 100644 features/step_definitions/project_commits_steps.rb create mode 100644 features/step_definitions/project_issues_steps.rb create mode 100644 features/step_definitions/project_team_steps.rb create mode 100644 features/step_definitions/project_wiki_steps.rb create mode 100644 features/step_definitions/projects_steps.rb create mode 100644 features/support/env.rb create mode 100644 lib/api.rb create mode 100644 lib/api/entities.rb create mode 100644 lib/api/helpers.rb create mode 100644 lib/api/projects.rb create mode 100644 lib/api/users.rb create mode 100644 lib/gitlab/inline_diff.rb create mode 100644 lib/gitlab/theme.rb create mode 100644 lib/tasks/cucumber.rake create mode 100644 lib/tasks/gitlab/backup.rake create mode 100644 lib/tasks/gitlab/test.rake create mode 100755 script/cucumber create mode 100644 spec/api/projects_spec.rb create mode 100644 spec/api/users_spec.rb create mode 100644 spec/models/issue_observer_spec.rb create mode 100644 spec/models/system_hook_spec.rb create mode 100644 spec/models/user_observer_spec.rb create mode 100644 spec/requests/admin/admin_hooks_spec.rb create mode 100644 spec/requests/dashboard_spec.rb create mode 100644 spec/requests/last_push_widget_spec.rb delete mode 100644 spec/requests/projects_tree_perfomance_spec.rb delete mode 100644 spec/requests/top_panel_spec.rb create mode 100644 spec/support/api.rb create mode 100644 vendor/assets/javascripts/jquery.waitforimages.js [email protected]:~/gitlab$ git pull origin stable From git://github.com/gitlabhq/gitlabhq
• branch stable -> FETCH_HEAD Already up-to-date. [email protected]:~/gitlab$ bundle install --without development test Fetching gem metadata from http://rubygems.org/....... Fetching gem metadata from http://rubygems.org/.. Updating https://github.com/gitlabhq/grit.git Fetching https://github.com/gitlabhq/grack.git remote: Counting objects: 149, done. remote: Compressing objects: 100% (84/84), done. remote: Total 149 (delta 59), reused 135 (delta 51) Receiving objects: 100% (149/149), 26.44 KiB, done. Resolving deltas: 100% (59/59), done. Updating https://github.com/gitlabhq/pygments.rb.git Fetching https://github.com/gitlabhq/omniauth-ldap.git remote: Counting objects: 147, done. remote: Compressing objects: 100% (85/85), done. remote: Total 147 (delta 48), reused 130 (delta 35) Receiving objects: 100% (147/147), 74.95 KiB | 78 KiB/s, done. Resolving deltas: 100% (48/48), done. Using rake (0.9.2.2) Using i18n (0.6.0) Installing multi_json (1.3.6) Installing activesupport (3.2.5) Using builder (3.0.0) Installing activemodel (3.2.5) Using erubis (2.7.0) Using journey (1.0.3) Using rack (1.4.1) Using rack-cache (1.2) Using rack-test (0.6.1) Using hike (1.2.1) Using tilt (1.3.3) Using sprockets (2.1.3) Installing actionpack (3.2.5) Using mime-types (1.18) Using polyglot (0.3.3) Using treetop (1.4.10) Using mail (2.4.4) Installing actionmailer (3.2.5) Using arel (3.0.2) Using tzinfo (0.3.33) Installing activerecord (3.2.5) Installing activeresource (3.2.5) Using bundler (1.1.4) Using rack-ssl (1.3.2) Installing json (1.7.3) with native extensions Using rdoc (3.12) Installing thor (0.15.2) Installing railties (3.2.5) Installing rails (3.2.5) Installing acts-as-taggable-on (2.3.1) Using acts_as_list (0.1.6) Using bcrypt-ruby (3.0.1) Using blankslate (2.1.2.4) Installing bootstrap-sass (2.0.3.1) Using carrierwave (0.6.2) Using charlock_holmes (0.6.8) Using chosen-rails (0.9.8) Installing coffee-script-source (1.3.3) Installing execjs (1.4.0) Using coffee-script (2.2.0) Using coffee-rails (3.2.2) Using colored (1.2) Using daemons (1.1.8) Installing orm_adapter (0.3.0) Installing warden (1.2.1) Installing devise (2.1.2) Using diff-lcs (1.1.3) Using drapper (0.8.4) Using escape_utils (0.2.4) Using eventmachine (0.12.10) Using ffaker (1.14.0) Using ffi (1.0.11) Installing foreman (0.47.0) Using git (1.2.5) Using posix-spawn (0.3.6) Using grit (2.5.0) from https://github.com/gitlabhq/grit.git (at 7f35cb9) Using hashery (1.4.0) Using gitolite (0.0.4.alpha) from https://github.com/gitlabhq/gitolite-client.git (at 9b715ca) Using grack (1.0.0) from https://github.com/gitlabhq/grack.git (at master) Using hashie (1.2.0) Using multi_xml (0.5.1) Installing rack-mount (0.8.3) Installing grape (0.2.0) Installing haml (3.1.6) Using haml-rails (0.3.4) Using httparty (0.8.3) Using jquery-rails (2.0.2) Installing jquery-ui-rails (0.5.0) Using kaminari (0.13.0) Using kgio (2.7.4) Using libv8 (3.3.10.4) Installing rubypython (0.6.2) Using pygments.rb (0.2.13) from https://github.com/gitlabhq/pygments.rb.git (at 2cada02) Using linguist (1.0.0) from https://github.com/gitlabhq/linguist.git (at master) Using modernizr (2.5.3) Using mysql2 (0.3.11) Using net-ldap (0.2.2) Using omniauth (1.1.0) Using pyu-ruby-sasl (0.0.3.3) Using rubyntlm (0.1.1) Using omniauth-ldap (1.0.2) from https://github.com/gitlabhq/omniauth-ldap.git (at 7edf27d) Using rack-protection (1.2.0) Installing raindrops (0.9.0) with native extensions Installing raphael-rails (1.5.2) Using redcarpet (2.1.1) Using redis (2.2.2) Using redis-namespace (1.0.3) Using sinatra (1.3.2) Using vegas (0.1.11) Using resque (1.20.0) Using resque_mailer (2.0.3) Installing sass (3.1.19) Installing sass-rails (3.2.5) Using seed-fu (2.2.0) Installing settingslogic (2.0.8) Using six (0.2.0) Using sqlite3 (1.3.6) Using stamp (0.1.6) Installing tabs_on_rails (2.1.1) Using therubyracer (0.10.1) Using thin (1.3.1) Using uglifier (1.0.3) Using unicorn (4.3.1) Using yaml_db (0.2.2) from https://github.com/gitlabhq/yaml_db.git (at master) Your bundle is complete! It was installed into ./vendor/bundle [email protected]:~/gitlab$ bundle exec rake db:migrate RAILS_ENV=production == RemoveCriticalFromIssue: migrating ======================================== -- remove_column(:issues, :critical) -> 0.0327s == RemoveCriticalFromIssue: migrated (0.0329s) ===============================

== AddLockableToUsers: migrating ============================================= -- add_column(:users, :failed_attempts, :integer, {:default=>0}) -> 0.0055s -- add_column(:users, :locked_at, :datetime) -> 0.0045s == AddLockableToUsers: migrated (0.0103s) ====================================

== AddTypeToWebHook: migrating =============================================== -- add_column(:web_hooks, :type, :string, {:default=>"ProjectHook"}) -> 0.0093s == AddTypeToWebHook: migrated (0.0095s) ======================================

[email protected]:~/gitlab$ bundle exec rails s -e production -d => Booting Thin => Rails 3.2.5 application starting in production on http://0.0.0.0:3000 /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/settingslogic-2.0.8/lib/settingslogic.rb:173:in missing_key': Missing setting 'web ' in /home/gitlab/gitlab/config/gitlab.yml (Settingslogic::MissingSetting) from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/settingslogic-2.0.8/lib/settingslogic.rb:127:inmethod_missing' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/settingslogic-2.0.8/lib/settingslogic.rb:77:in method_missing' from /home/gitlab/gitlab/config/initializers/1_settings.rb:10:inweb_host' from /home/gitlab/gitlab/app/mailers/notify.rb:5:in <class:Notify>' from /home/gitlab/gitlab/app/mailers/notify.rb:1:in<top (required)>' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/activesupport-3.2.5/lib/active_support/dependencies.rb:251:in require ' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/activesupport-3.2.5/lib/active_support/dependencies.rb:251:inblock i n require' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/activesupport-3.2.5/lib/active_support/dependencies.rb:236:in load_de pendency' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/activesupport-3.2.5/lib/active_support/dependencies.rb:251:inrequire ' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/activesupport-3.2.5/lib/active_support/dependencies.rb:359:in require _or_load' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/activesupport-3.2.5/lib/active_support/dependencies.rb:313:independ_ on' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/activesupport-3.2.5/lib/active_support/dependencies.rb:225:in require _dependency' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/engine.rb:439:inblock (2 levels) in eager_l oad!' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/engine.rb:438:in each' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/engine.rb:438:inblock in eager_load!' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/engine.rb:436:in each' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/engine.rb:436:ineager_load!' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/application/finisher.rb:53:in block in <modu le:Finisher>' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/initializable.rb:30:ininstance_exec' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/initializable.rb:30:in run' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/initializable.rb:55:inblock in run_initiali zers' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/initializable.rb:54:in each' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/initializable.rb:54:inrun_initializers' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/application.rb:136:in initialize!' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/railtie/configurable.rb:30:inmethod_missing ' from /home/gitlab/gitlab/config/environment.rb:5:in <top (required)>' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/activesupport-3.2.5/lib/active_support/dependencies.rb:251:inrequire ' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/activesupport-3.2.5/lib/active_support/dependencies.rb:251:in block i n require' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/activesupport-3.2.5/lib/active_support/dependencies.rb:236:inload_de pendency' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/activesupport-3.2.5/lib/active_support/dependencies.rb:251:in require ' from /home/gitlab/gitlab/config.ru:4:inblock in ' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/rack-1.4.1/lib/rack/builder.rb:51:in instance_eval' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/rack-1.4.1/lib/rack/builder.rb:51:ininitialize' from /home/gitlab/gitlab/config.ru:1:in new' from /home/gitlab/gitlab/config.ru:1:in' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/rack-1.4.1/lib/rack/builder.rb:40:in eval' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/rack-1.4.1/lib/rack/builder.rb:40:inparse_file' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/rack-1.4.1/lib/rack/server.rb:200:in app' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/commands/server.rb:46:inapp' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/rack-1.4.1/lib/rack/server.rb:301:in wrapped_app' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/rack-1.4.1/lib/rack/server.rb:252:instart' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/commands/server.rb:70:in start' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/commands.rb:55:inblock in <top (required)>' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/commands.rb:50:in tap' from /home/gitlab/gitlab/vendor/bundle/ruby/1.9.1/gems/railties-3.2.5/lib/rails/commands.rb:50:in<top (required)>' from script/rails:6:in require' from script/rails:6:in'