Philip Blatter
a7bdf87f43
Added some tests.
2014-05-05 21:50:03 +02:00
Philip Blatter
11bedfe37d
Now using correct ids as reference if we are informing about a new note.
2014-05-05 21:48:49 +02:00
Philip Blatter
06bed543e6
Added email threading for update emails on issues and merge requests (if the mail client support the References: mail header)
2014-05-05 21:46:51 +02:00
Dmitriy Zaporozhets
aeb5a01ed1
Merge branch 'improve-dev-seeds' into 'master'
...
Improve dev seeds
2014-05-05 13:43:52 +00:00
Dmitriy Zaporozhets
2fbb4b0545
Merge branch 'clean-satellite' into 'master'
...
Clean working directory in satellite
2014-05-05 13:43:12 +00:00
Dmitriy Zaporozhets
f5c4bda8fe
Improve MR seeds
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-05-05 15:07:19 +03:00
Dmitriy Zaporozhets
4f670fbe9c
Create seed projects with different visibility
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-05-05 14:30:50 +03:00
Dmitriy Zaporozhets
cac916d974
Clean working directory in satellite
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-05-05 14:21:00 +03:00
Sytse Sijbrandij
f09a1ef81d
Merge branch 'add_database_req' into 'master'
...
Add database req
added database requirements in documentation
2014-05-05 08:46:39 +00:00
Marc Radulescu
73801a7463
added database requirements in documentation
2014-05-05 10:04:52 +02:00
Dmitriy Zaporozhets
172ad96245
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2014-05-03 20:50:54 +03:00
Dmitriy Zaporozhets
ee62a60f1d
Merge branch 'add-cli-to-reame' into 'master'
...
Add cli to reame
2014-05-03 17:43:19 +00:00
Sytse Sijbrandij
d5e49e2592
Merge branch 'fix-typo-help-permissions' into 'master'
...
Fix documentation typo in permissions help file
2014-05-03 11:59:13 +00:00
dosire
cac61501fd
Add command line client information and fix link to ee.
2014-05-03 11:03:34 +02:00
Dmitriy Zaporozhets
993fc84855
Use sign icon style for help link
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-05-02 22:00:23 +03:00
Dmitriy Zaporozhets
c5ef0c60bf
Merge branch 'improve-admin-projects-page' into 'master'
...
Improve admin projects page
Add dropdown for project sorting
2014-05-02 15:07:54 +00:00
Dmitriy Zaporozhets
c608a5dcea
Add sort dropdown for admin projects page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-05-02 17:02:57 +03:00
Dmitriy Zaporozhets
9dfc4fe6ac
Merge branch 'repo-size-in-db' into 'master'
...
Save repository size to projects table
This will allow us to get largest repos by simple sql query.
Also it increase loading of `admin/projects` page a lot because right now it calculate 20x project sizes per page
2014-05-02 13:48:26 +00:00
Dmitriy Zaporozhets
3bec6e8940
Merge branch 'fix-404-jquery-ui' into 'master'
...
Fix 404 jquery ui
Fixes #1211
2014-05-02 13:07:12 +00:00
Dmitriy Zaporozhets
d10b34a685
Save repository size to projects table
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-05-02 16:05:08 +03:00
Dmitriy Zaporozhets
0242124525
Fix 404 on jquery ui images
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-05-02 14:48:32 +03:00
Dmitriy Zaporozhets
87c397f577
More fixes to gitlab:shell:install
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-05-02 14:13:45 +03:00
Dmitriy Zaporozhets
59b81a6664
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2014-05-02 13:47:01 +03:00
Dmitriy Zaporozhets
d74b8b450a
Merge branch 'pkgr-improve-gitlab-shell-installation'
2014-05-02 13:46:44 +03:00
Dmitriy Zaporozhets
dd47f9532f
Fix gitlab-shell setup rake task
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-05-02 13:46:32 +03:00
Dmitriy Zaporozhets
c883660a3e
Fix install docs for gitlab-shell setup rake task
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-05-02 13:46:15 +03:00
Dmitriy Zaporozhets
85b5d203ac
Merge branch 'improve-gitlab-shell-installation' of https://github.com/pkgr/gitlabhq into pkgr-improve-gitlab-shell-installation
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
doc/install/installation.md
2014-05-02 13:30:26 +03:00
Sytse Sijbrandij
4f8525d3b9
Merge branch 'update-release-dates' into 'master'
...
Update release dates
2014-05-02 10:26:22 +00:00
Dmitriy Zaporozhets
b2a258722b
Modify release dates for EE and CI
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-05-02 13:23:12 +03:00
Dmitriy Zaporozhets
7660290b37
Merge pull request #6892 from cirosantilli/remove-signin-link-front-page
...
Remove redundant signin link from signin page.
2014-05-01 22:58:48 +03:00
Dmitriy Zaporozhets
aedb20113d
Merge pull request #6879 from arantir/patch-1
...
Typo fix
2014-05-01 22:51:56 +03:00
Dmitriy Zaporozhets
d4b84d1677
Merge pull request #6906 from agjmills/patch-1
...
Updated CI error message so that it makes more sense
2014-05-01 22:50:04 +03:00
Alexander Mills
cc9b7cba38
Updated CI error message so that it makes more sense
2014-05-01 15:42:28 +01:00
Dmitriy Zaporozhets
d4b4088321
Merge pull request #6897 from cirosantilli/help-every-page
...
Add help link to header.
2014-05-01 11:58:55 +03:00
Ciro Santilli
469077e55d
Add help link to header.
2014-05-01 09:14:52 +02:00
Dmitriy Zaporozhets
86726662e7
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-05-01 09:06:04 +03:00
Dmitriy Zaporozhets
c258a28550
Merge branch 'notes-are-comments' into 'master'
...
Notes are comments
2014-04-30 18:37:11 +00:00
dosire
5bf12bbb1d
Make clear that notes also serve as comments.
2014-04-30 17:28:05 +02:00
Sytse Sijbrandij
901fc30049
Merge branch 'forgot-import-readme' into 'master'
...
Forgot import readme
/cc @dzaporozhets
2014-04-30 13:03:41 +00:00
dosire
9571743d8f
Import rake task documentation in separate file.
2014-04-30 15:02:42 +02:00
Sytse Sijbrandij
a64724611f
Merge branch 'import-check' into 'master'
...
Import check
/cc @dzaporozhets
2014-04-30 13:01:32 +00:00
dosire
af2a39470f
Make import docs more prominent.
2014-04-30 15:00:49 +02:00
Sytse Sijbrandij
e284337307
Merge branch 'slack-doc-readme' into 'master'
...
Slack doc readme
2014-04-30 11:35:55 +00:00
dosire
193a9e7d4c
Add link to slack docs.
2014-04-30 13:35:35 +02:00
Dmitriy Zaporozhets
dc55127c1d
Merge branch 'refresh_unless_hidden' into 'master'
...
Refresh Notes unless the tab is hidden
2014-04-29 18:02:33 +00:00
Jacob Vosmaer
c8cf90d286
Add document.hidden improvement to CHANGELOG
2014-04-29 17:23:29 +02:00
Jacob Vosmaer
0b914e7ceb
Refresh notes when the page becomes visible
2014-04-29 17:21:58 +02:00
Jacob Vosmaer
e52f50c22f
Do not refresh notes on hidden tabs
2014-04-29 17:21:58 +02:00
Dmitriy Zaporozhets
9eeb96846f
Merge pull request #6877 from Nighoo/repository_push_email.text
...
do not html encode plaintext part of emails for push notifications
2014-04-29 18:07:55 +03:00
Dmitriy Zaporozhets
dba913aa38
Merge pull request #6876 from dblessing/fix_broadcast_text
...
Fix unclear text in broadcast message view.
2014-04-29 18:07:26 +03:00