Commit Graph
14039 Commits
Author SHA1 Message Date
Job van der VoortandMarin Jankovski d2e92940b4 add newsletter to release doc
Conflicts:
	doc/release/monthly.md
2014-05-22 16:21:59 +02:00
Marin Jankovski b6a88c7850 Update casing of gitlab.com. 2014-05-22 15:41:33 +02:00
Marin Jankovski 0957f341b1 Updates for the monthly release document. 2014-05-22 15:18:28 +02:00
dosire 114e67564d The 4.0 raketask is no longer needed and rebuilding of missing satellites is automatic. 2014-05-22 14:40:38 +02:00
Dmitriy Zaporozhets 36cac35b24 Dont allow remove of protected branch
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-22 15:38:47 +03:00
Dmitriy Zaporozhets a9d60b3b14 Api call to remove branch
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-22 14:39:50 +03:00
Dmitriy Zaporozhets 0455391add Improve branch-removal logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-22 14:39:09 +03:00
Dmitriy Zaporozhets e089b11b7a Add BranchesHelper
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-22 14:38:48 +03:00
Dmitriy Zaporozhets 88781783dd Delete branch service with permission checks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-22 14:23:20 +03:00
Dmitriy Zaporozhets 1ad174fbcd Improve edit page UI/UX
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-22 12:25:44 +03:00
Marin Jankovski 38d0e001ea Version to 6.9.0 2014-05-22 11:09:00 +02:00
Marin Jankovski dc7158a0f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-05-22 11:06:59 +02:00
Marin Jankovski b019c06195 Required shell version is now 1.9.4. 2014-05-22 11:01:01 +02:00
Sytse Sijbrandij 66dfe37d41 Merge branch 'grammar_fixes' into 'master'
Grammar fixes

fixed typos in groups messages
2014-05-22 08:50:42 +00:00
Marc Radulescu f5147780ff Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into grammar_fixes 2014-05-22 10:35:13 +02:00
Marc Radulescu d1980adf93 typos fixed 2014-05-22 10:35:01 +02:00
Sytse Sijbrandij 9f80ab8e75 Merge branch 'dev-setup-on-metal' into 'master'
Dev setup on metal
2014-05-21 11:06:40 +00:00
dosire 60053e6e2c It now is a metal dev install. 2014-05-21 13:06:12 +02:00
Dmitriy Zaporozhets f420ae4b18 Merge branch 'cloud-com' into 'master'
Cloud com
2014-05-21 10:02:19 +00:00
Mathieu Schroeter b3b0876e98 Add the http(s) command lines in the mails for the new origin when a project was moved in an other namespace. 2014-05-21 10:37:41 +02:00
Alan Kehoe b08fe47fe8 Update message on the group dashboard page 2014-05-20 22:03:34 +01:00
dosire 13761caead Fixed spelling mistake in readme with a whole room watching. 2014-05-20 20:51:35 +02:00
Jacob Vosmaer 3199ef079c Merge branch 'deploy-key-projects' into 'master'
Deploy key in multiple projects

Add doc on adding a deploy key easily to multiple projects through the API.
2014-05-20 16:19:09 +00:00
Dmitriy Zaporozhets d52a3281dc Merge branch 'small-ui-improvements' into 'master'
Small ui improvements

* fix ugly errors block when admin save invalid user
* fix ugly errors when you tries to save invalid wiki page
2014-05-20 15:44:45 +00:00
Dmitriy Zaporozhets ac46130748 Allow set group avatar when create group. Not only edit page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-20 16:36:51 +03:00
Dmitriy Zaporozhets 2e8f4bf392 Merge branch 'milestome-ui' into 'master'
Improve Milestome UI

Milestone UI header was different from Issue/MR pages but use same UI elements.
This MR fixes it so UI looks same for issue/mr/milestone
2014-05-20 13:30:42 +00:00
Dmitriy Zaporozhets 1a4c9118ae Fix UI for wiki error message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-20 16:22:47 +03:00
Olaf Mandel c18e2778b2 Fix avatar URLs in JS-lists for relative_url_root
In user lists created when entering a (partial) user name into
a field, the URL to the user avatar was invalid if running with
relative_url_root.

This patch is the result of:
sed -i 's/\(= *\)\(user\.avatar_url\)/\1gon.relative_url_root + \2/' \
    app/assets/javascripts/*.coffee
2014-05-20 15:22:23 +02:00
Dmitriy Zaporozhets 9eb7fe6d06 Fix admin user errors ui
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-20 16:21:30 +03:00
dosire ce8e7d280b Change cloud into .com 2014-05-20 14:30:25 +02:00
dosire 0660183cb0 Renamed based on suggestion Martijn. 2014-05-20 13:29:52 +02:00
Dmitriy Zaporozhets 761fbbfeea Merge branch 'fix-install-guide' into 'master'
Fix install guide

Fix gitlab setup. DB setup must go after gitlab-shell setup. Because in seeds we need `/home/git/repositories` to exist
2014-05-20 09:10:37 +00:00
Dmitriy Zaporozhets c05117d9a2 Merge branch 'create_pg_indexes' into 'master'
Rebuild Postgres indexes after a MySQL conversion
2014-05-20 09:10:08 +00:00
Dmitriy Zaporozhets 5d77088202 Do gitlab:shell setup before seeds because we need /home/git/repositories exists
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-20 12:00:23 +03:00
Job van der Voort ea109704d1 everything in header 2014-05-19 20:35:59 +02:00
Jacob Vosmaer 8ee3299cc4 Import the database as the git user
This ensures that all tables created during the import belong to `git`.
If you import as a different user, such as the `postgres` superuser, you
may encounter issues where the GitLab database user cannot access tables
in gitlabhq_production, _even if_ `git` is the owner of
gitlabhq_production at the time of import.
2014-05-19 18:28:45 +02:00
Jacob Vosmaer 6be0188b5c Rebuild indexes after a MySQL conversion 2014-05-19 17:51:58 +02:00
Jacob Vosmaer dca537ab29 Use the gitlabhq fork of the MySQL converter 2014-05-19 17:49:29 +02:00
Dmitriy Zaporozhets f08cb26487 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-19 15:48:52 +03:00
Dmitriy Zaporozhets eb06509a37 Merge branch 'ubuntu-14-needs-recent-ruby-patch' into 'master'
Ubuntu 14 needs recent ruby patch
2014-05-19 12:48:34 +00:00
dosire 126eefc5b8 Ruby version updated so it doesn't have the readline bug https://www.ruby-lang.org/en/news/2014/05/09/ruby-2-0-0-p481-is-released/. 2014-05-19 14:45:55 +02:00
Sytse Sijbrandij 0484f72c34 Merge pull request #6998 from pkallberg/master
Added Cloud 66 to third party one-click installers
2014-05-19 14:05:39 +02:00
Philip Källberg 50313b646d Removed exclamation mark for Cloud 66 installer 2014-05-19 12:55:56 +01:00
Philip Källberg 0202c98772 Added Cloud 66 to third party one-click installers 2014-05-19 12:45:52 +01:00
Marin Jankovski 971dc47907 Fix typo. 2014-05-19 12:43:16 +02:00
Dmitriy Zaporozhets 3a279bb2a9 Merge branch '6.9.0.rc1' into 'master'
Version 6.9.0.rc1
2014-05-19 10:37:47 +00:00
Dmitriy Zaporozhets 85c5a20352 Small UI change to milestone page so it looks similar to issue/mr
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-19 13:34:26 +03:00
Marin Jankovski aacd43d72d 6.9.0 RC1 v6.9.0.rc1 2014-05-19 12:31:20 +02:00
Marin Jankovski 39d95b1d94 Update installation guide, create update guide. 2014-05-19 12:30:30 +02:00
Marin Jankovski f0b3092d2f Recommend issue name. 2014-05-19 11:52:02 +02:00