summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG18
-rw-r--r--ROADMAP.md9
2 files changed, 25 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 58111484087..2eca1f14c4f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,21 @@
+v 3.1.0
+ - Updated gems
+ - Services: Gitlab CI integration
+ - Events filter on dashboard
+ - Own namespace for redis/resque
+ - Optimized commit diff views
+ - add alphabetical order for projects admin page
+ - Improved web editor
+ - Commit stats page
+ - Documentation split and cleanup
+ - Link to commit authors everywhere
+ - Restyled milestones list
+ - added Milestone to Merge Request
+ - Restyled Top panel
+ - Refactored Satellite Code
+ - Added file line links
+ - moved from capybara-webkit to poltergeist + phantomjs
+
v 3.0.3
- Fixed bug with issues list in Chrome
- New Feature: Import team from another project
diff --git a/ROADMAP.md b/ROADMAP.md
index 093a23f577d..465342f8992 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -5,7 +5,6 @@
* Help page for service tasks like repos import, backup etc
* Hide last push widget after following link
* Add comment events
-* Dashboard/Project activity events filter
### Issues
@@ -15,5 +14,11 @@
### Merge Request
-* CI build status
* Save code fragments with MR comments
+
+### Services
+
+* Campfire integration service
+* Hipchat integration service
+* Travis CI integration service
+* Jenkins CI integration service