4 0 stable (!10409) · Merge requests · gpt / large_projects / gitlabhq1 · GitLab

Snippets Groups Projects

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

An error occurred while fetching the assigned milestone of the selected merge_request.

Closed gitlab-qa-bot requested to merge 4-0-stable into master 8 years ago

Viewing commit 6e067482

Show latest version

2 files

+ 27

− 27

Files

2

6e067482

updating rails to 3.2.11 in response to CVE-2013-0156 · 6e067482
David Van Duzer authored 12 years ago
```
See also:
https://github.com/gitlabhq/gitlabhq/issues/2526
http://www.securityfocus.com/bid/57187
```

Conflict: This file was modified in both the source and target branches. Ask someone with write access to resolve it.

+ 1

− 1

@@ -8,7 +8,7 @@ def linux_only(require_as)
@@ -8,7 +8,7 @@ def linux_only(require_as)
  RUBY_PLATFORM.include?('linux') && require_as
  RUBY_PLATFORM.include?('linux') && require_as
end
end


gem "rails", "3.2.10"
gem "rails", "3.2.11"


# Supported DBs
# Supported DBs
gem "mysql2", group: :mysql
gem "mysql2", group: :mysql