Jacob Vosmaer
faacfc91ed
Merge pull request #5619 from taziyah/patch-1
...
Fix diff command for gitlab.yml.example
2013-11-19 23:52:03 -08:00
Dmitriy Zaporozhets
33eae33423
Merge branch 'full-post-to-oss-security' of /home/git/repositories/gitlab/gitlabhq
2013-11-19 17:04:05 +00:00
Sytse Sijbrandij
6413bfb5c6
Merge branch 'master' into full-post-to-oss-security
...
Conflicts:
doc/release/security.md
2013-11-19 16:38:43 +01:00
Dmitriy Zaporozhets
6cc3cc5152
Changelog entries and version up to beta1
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-19 17:27:23 +02:00
Dmitriy Zaporozhets
9772cefc43
Merge branch 'feature/api_delete_file' of /home/git/repositories/gitlab/gitlabhq
2013-11-19 15:25:38 +00:00
Dmitriy Zaporozhets
b0f300063e
Merge branch 'feature/delete_file' of /home/git/repositories/gitlab/gitlabhq
2013-11-19 15:06:53 +00:00
Dmitriy Zaporozhets
a185cce5d3
Tests for delete file by API
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-19 16:36:11 +02:00
Dmitriy Zaporozhets
32d7332d2c
API: delete file from repository
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-19 16:33:38 +02:00
Dmitriy Zaporozhets
bd20ec1a34
Remove file from repository feature
...
After click on remove file button you will be asked for commit message
via modal window. After submitting modal form file will be removed from
repository
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-19 16:14:56 +02:00
Dmitriy Zaporozhets
4cac195a0e
DeleteFile context
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-19 16:14:06 +02:00
Dmitriy Zaporozhets
8a91e5d7d0
Fix DeleteFile satellite action
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-19 16:13:37 +02:00
Dmitriy Zaporozhets
b26abe8ff8
Delete file action for satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-19 15:41:32 +02:00
Dmitriy Zaporozhets
60959df3f2
Remove gitolite mention
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-19 15:41:11 +02:00
Dmitriy Zaporozhets
8841eec426
Improve snippets UX
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-18 21:34:07 +02:00
Dmitriy Zaporozhets
6d125d4771
Merge branch 'cve_changelog' of /home/git/repositories/gitlab/gitlabhq
2013-11-18 19:12:32 +00:00
Dmitriy Zaporozhets
b59ba97998
Merge branch 'feature/api_projects_all' of /home/git/repositories/gitlab/gitlabhq
2013-11-18 19:10:37 +00:00
Tobias Millauer
8ddadc9971
Update 6.0-to-6.2.md
2013-11-18 19:22:39 +01:00
Dmitriy Zaporozhets
434d276dba
better wording for api doc
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-18 19:53:10 +02:00
Jacob Vosmaer
100615896b
Add security patch releases to CHANGELOG
2013-11-18 17:59:09 +01:00
Sytse Sijbrandij
250a86d278
Also add CVE to changelog.
2013-11-18 17:45:28 +01:00
Sytse Sijbrandij
6cdd08965e
Full post to OSS security.
2013-11-18 17:43:25 +01:00
Dmitriy Zaporozhets
11931bfb9c
update projects api docs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-18 16:49:29 +02:00
Dmitriy Zaporozhets
ba169cc52d
API: projects/all tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-18 16:42:56 +02:00
Dmitriy Zaporozhets
a09fc160d0
Add project.all for API if admin
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-18 14:15:59 +02:00
Dmitriy Zaporozhets
f614fa97ae
Merge branch 'security-update' of /home/git/repositories/gitlab/gitlabhq
2013-11-18 09:32:06 +00:00
Sytse Sijbrandij
9be86adbbc
Inform community of our timing.
2013-11-17 08:46:04 -05:00
Dmitriy Zaporozhets
c938833bd9
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2013-11-15 16:20:00 +02:00
Dmitriy Zaporozhets
875728b118
Merge branch 'feature/admin_project_transfer' of /home/git/repositories/gitlab/gitlabhq
2013-11-15 14:19:49 +00:00
Dmitriy Zaporozhets
27ad882693
CHANGELOG entry
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-15 15:30:25 +02:00
Dmitriy Zaporozhets
9340d4887f
Namespaces api specs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-15 15:29:53 +02:00
Dmitriy Zaporozhets
0815098d3a
Admin can transfer project to any namespace
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-15 15:25:37 +02:00
Dmitriy Zaporozhets
dcea191314
Select2 tag for namespaces with ajax loading
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-15 15:25:09 +02:00
Dmitriy Zaporozhets
0759dd4513
Namespaces API for admin users
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-15 15:24:10 +02:00
Dmitriy Zaporozhets
adb58e36ba
Merge pull request #5557 from dpursehouse/merge-status-message-improvement
...
Improve status message on merge request page
2013-11-15 03:55:18 -08:00
Dmitriy Zaporozhets
77e3fab89f
More entries to CHANGELOG
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-15 09:20:35 +02:00
Dmitriy Zaporozhets
a7d3e2b9b6
Fix recent branches order. Added counters
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-15 09:18:06 +02:00
Dmitriy Zaporozhets
83b6e5d65a
Merge branch 'release-doc' of /home/git/repositories/gitlab/gitlabhq
2013-11-15 07:06:45 +00:00
Dmitriy Zaporozhets
eed8abf89a
Merge branch 'broadcast-wording' of /home/git/repositories/gitlab/gitlabhq
2013-11-15 07:05:01 +00:00
Sytse Sijbrandij
6156cacbe9
Improve formulation of the sentence.
2013-11-14 13:50:07 -05:00
Sytse Sijbrandij
580049c04b
Separate procedures for both releases.
2013-11-14 13:40:05 -05:00
Dmitriy Zaporozhets
42d9400e5a
Improve markdwon typography
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-14 20:14:07 +02:00
Dmitriy Zaporozhets
f51c21b671
Minor ui fixes
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-14 17:57:09 +02:00
Dmitriy Zaporozhets
83b0a24e05
Merge branch 'update_gitlab_shell' of /home/git/repositories/gitlab/gitlabhq
2013-11-14 15:38:53 +00:00
Dmitriy Zaporozhets
9fbbae9dbf
Small css cleanup
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-14 17:23:31 +02:00
Dmitriy Zaporozhets
7d037c111b
Refactor Chosen.js select css
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-14 17:01:23 +02:00
Jacob Vosmaer
0ab0ca0d9d
Use gitlab-shell 1.7.8
2013-11-14 13:35:45 +01:00
Dmitriy Zaporozhets
c946defb3d
Restyle ui-box to be more flat
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-13 17:56:14 +02:00
Dmitriy Zaporozhets
9fbe3ac771
Nicer ui-box-danger
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-13 17:39:04 +02:00
Dmitriy Zaporozhets
aed65f56ec
New style for buttons (bootstrap 3 like)
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-13 17:35:44 +02:00
Dmitriy Zaporozhets
37741f3eb8
Fix small select width for trasnfer project
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-13 17:06:24 +02:00