GitLab wurde erfolgreich aktualisiert. Dank regelmäßiger Updates bleibt das THM GitLab sicher und Sie profitieren von den neuesten Funktionen. Danke für Ihre Geduld.

Commit 0d65f09f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'report-errors-on-service-creation' of https://gitlab.com/stanhu/gitlab-ce

parents 3f471532 99fd78d6
......@@ -2,6 +2,8 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.3.0 (unreleased)
- Add button to automatically merge a merge request when the build succeeds (Zeger-Jan van de Weg)
- Merge when build succeeds (Zeger-Jan van de Weg)
- Provide better diagnostic message upon project creation errors (Stan Hu)
- Bump gollum-lib to 4.1.0 (Stan Hu)
- Fix broken group avatar upload under "New group" (Stan Hu)
- Update project repositorize size and commit count during import:repos task (Stan Hu)
......
......@@ -64,8 +64,10 @@ def execute
after_create_actions if @project.persisted?
@project
rescue
@project.errors.add(:base, "Can't save project. Please try again later")
rescue => e
message = "Unable to save project: #{e.message}"
Rails.logger.error(message)
@project.errors.add(:base, message) if @project
@project
end
......
......@@ -49,6 +49,13 @@
it { expect(@project.namespace).to eq(@group) }
end
context 'error handling' do
it 'handles invalid options' do
@opts.merge!({ default_branch: 'master' } )
expect(create_project(@user, @opts)).to eq(nil)
end
end
context 'wiki_enabled creates repository directory' do
context 'wiki_enabled true creates wiki repository directory' do
before do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment