summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-20 21:16:42 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-20 21:16:42 +0200
commitd188adfd97417be489df8a1cef2ca3bf986676ee (patch)
treea03053dbb43d36e5c41910c62ce04e2a1fd24303
parentd8d95c85aea31a3814c7c9910a4bf429510ec481 (diff)
downloadgitlab-ce-d188adfd97417be489df8a1cef2ca3bf986676ee.tar.gz
Changelog updated. Added warnings to username form
-rw-r--r--CHANGELOG11
-rw-r--r--app/views/profiles/account.html.haml3
-rw-r--r--config/gitlab.yml.example3
3 files changed, 17 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 73933e0be4b..95ed6e8db1c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,15 @@
v 4.0.0
+ - Reorganized settings
+ - Fixed commits compare
+ - Refactored scss
+ - Improve status checks
+ - Validates presence of User#name
+ - Fixed postgres support
+ - Removed sqlite support
+ - Modified post-receive hook
+ - Milestones can be closed now
+ - Show comment events on dashboard
+ - Quick add team members via group#people page
- [API] expose created date for hooks and SSH keys
- [API] list, create issue notes
- [API] list, create snippet notes
diff --git a/app/views/profiles/account.html.haml b/app/views/profiles/account.html.haml
index 3b5099edbdb..3c290948d6c 100644
--- a/app/views/profiles/account.html.haml
+++ b/app/views/profiles/account.html.haml
@@ -71,6 +71,9 @@
%span.update-failed.cred.hide
%i.icon-ok
Failed
+ %ul.cred
+ %li It will change web url for personal projects.
+ %li It will change the git path to repositories for personal projects.
.input
= f.submit 'Save username', class: "btn save-btn"
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index c8387fa2caf..067dbd9b72b 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -1,3 +1,6 @@
+# # # # # # # # # # # # # # # # # #
+# Gitlab application config file #
+# # # # # # # # # # # # # # # # # #
#
# 1. GitLab app settings