Dmitriy Zaporozhets b03b69e23e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1 ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/images/brand_logo.png
	app/assets/stylesheets/sections/login.scss
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/appearances_helper.rb
	app/views/layouts/devise.html.haml

2014-07-16 12:39:45 +03:00

..

concerns

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-07-10 23:43:42 +03:00

network

Remove grit require

2013-09-30 13:59:16 +03:00

project_services

Merge branch 'ee_fix_jenkins_status_check' into 'master'

2014-07-14 09:35:15 +00:00

.gitkeep

init commit

2011-10-09 00:36:38 +03:00

ability.rb

Merge pull request #7131 from skv-headless/per_request_rules_caching

2014-07-14 13:58:53 +03:00

appearance.rb

Remove attr_accessible from EE only models

2014-07-11 14:38:56 +03:00

broadcast_message.rb

Use strong params for 5 more models

2014-06-26 15:00:09 +03:00

commit.rb

Refactor diff suppress logic and diff views

2014-07-15 18:28:21 +03:00

deploy_key.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

deploy_keys_project.rb

Use strong params for 5 more models

2014-06-26 15:00:09 +03:00

diff_line.rb

Refactor Parallel Diff feature and add scrollbars

2014-03-27 09:15:25 +13:00

email.rb

User model to strong params. Comment other attr_accessible to let tests run

2014-06-26 15:11:45 +03:00

event.rb

Merge branch 'bugfix/305/dashboard_feed_summaries' into 'master'

2014-07-02 07:00:16 +00:00

forked_project_link.rb

Use strong params for 5 more models

2014-06-26 15:00:09 +03:00

git_hook.rb

Remove attr_accessible from EE only models

2014-07-11 14:38:56 +03:00

group_milestone.rb

Milestone is closed only if all milestones are closed.

2014-07-14 15:25:09 +02:00

group.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-07-10 23:43:42 +03:00

issue.rb

Remove protected_atrributes gem and start moving to strong params

2014-06-26 14:30:07 +03:00

jira_issue.rb

Add a JiraIssue class

2014-06-13 15:40:09 +02:00

key.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-07-10 23:43:42 +03:00

ldap_key.rb

Make SSH keys synchronisation with LDAP not delete keys added by users.

2014-07-08 12:31:11 +02:00

merge_request_diff.rb

Key strong params

2014-06-26 17:00:05 +03:00

merge_request.rb

Refactor diff suppress logic and diff views

2014-07-15 18:28:21 +03:00

milestone.rb

Project hook, milestone, snippet strong params

2014-06-26 18:51:11 +03:00

namespace.rb

Merge pull request #7204 from cirosantilli/user-validation-msg

2014-07-02 09:57:14 +03:00

note.rb

Make app works with strong params

2014-06-26 23:24:17 +03:00

notification.rb

Improve notification settings page

2014-02-17 18:06:24 +02:00

personal_snippet.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

project_group_link.rb

Remove copyright licenses missed in 0fdab6a747.

2014-06-02 09:11:24 +02:00

project_hook.rb

Project hook, milestone, snippet strong params

2014-06-26 18:51:11 +03:00

project_snippet.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

project_team.rb

Merge remote-tracking branch 'ce/master'

2014-06-20 13:27:27 +02:00

project_wiki.rb

Allow nested files in wiki.

2014-04-28 16:22:31 +02:00

project.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-07-10 23:43:42 +03:00

protected_branch.rb

Use strong params for 5 more models

2014-06-26 15:00:09 +03:00

repository.rb

Use Contributor class instead of hash

2014-07-02 15:09:06 +03:00

service_hook.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

service.rb

Project services to strong params

2014-06-26 14:49:09 +03:00

snippet.rb

Project hook, milestone, snippet strong params

2014-06-26 18:51:11 +03:00

system_hook.rb

Re-annotate models

2014-04-09 15:05:03 +03:00

tree.rb

Use new gitlab_git gem. It makes CONTRIBUTING.md work

2014-02-27 15:52:14 +02:00

user.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-07-10 23:43:42 +03:00

users_group.rb

Use strong params for 5 more models

2014-06-26 15:00:09 +03:00

users_project.rb

Do not notify project owner on project creation.

2014-07-03 12:02:31 +02:00

web_hook.rb

team member and hook strong params

2014-06-26 18:45:33 +03:00

wiki_page.rb

A bit clearer naming for gollum_wiki.

2014-05-05 14:01:48 +02:00