Dmitriy Zaporozhets
f2eb668348
Feature test for New file feature
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-05 10:45:23 +02:00
Dmitriy Zaporozhets
bd2b6f5944
New feature: Create file from UI
...
Now you are able to create a new file in repository from your browser.
You are not allowed to create a file if file with same name already
exists in the repo.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-05 10:28:49 +02:00
Dmitriy Zaporozhets
2ee04b120a
Merge branch 'consistent-numbering' of /home/git/repositories/gitlab/gitlabhq
2013-11-04 19:37:21 +00:00
Sytse Sijbrandij
c467ef5221
Number 3 was missing.
2013-11-04 11:36:07 -08:00
Dmitriy Zaporozhets
400a55805c
Merge branch 'gitlab_shell_in_patch_doc' of /home/git/repositories/gitlab/gitlabhq
2013-11-04 19:30:26 +00:00
Jacob Vosmaer
27fe6cbe13
Include gitlab-shell in patch update doc
2013-11-04 20:28:07 +01:00
Dmitriy Zaporozhets
617cc8fb98
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2013-11-04 20:37:15 +02:00
Dmitriy Zaporozhets
f41731047f
Merge pull request #5507 from jojosch/project-issue-tracker-selection
...
Preselect the current issue tracker with selected="selected"
2013-11-04 10:32:19 -08:00
Dmitriy Zaporozhets
d6fce1055a
Merge pull request #5521 from mynetx/ie10-css-gradients
...
Support -ms-linear-gradient style for IE10+
2013-11-04 10:31:20 -08:00
Dmitriy Zaporozhets
0cf9c02c52
Merge pull request #5528 from mcepl/patch-1
...
Fix name of RHEL
2013-11-04 10:30:04 -08:00
Dmitriy Zaporozhets
14bc511fbe
Merge branch 'security_update_master' of /home/git/repositories/gitlab/gitlabhq
2013-11-04 18:21:22 +00:00
Dmitriy Zaporozhets
e1607ec455
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2013-11-04 19:00:11 +02:00
Dmitriy Zaporozhets
a9661c8dfe
Merge branch 'ui/namespace_title' of /home/git/repositories/dzaporozhets/gitlabhq
2013-11-04 15:00:35 +00:00
Dmitriy Zaporozhets
6d86b698e3
Always show namespace for project title
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-04 15:18:55 +02:00
Matěj Cepl
aff447b4dd
Fix name of RHEL
...
The company is called Red Hat, and its flagship product is Red Hat Enterprise Linux (commonly abbreviated as RHEL). There is no such thing as RedHat (and never was).
2013-11-04 10:08:13 +01:00
Jacob Vosmaer
186e8ad996
Merge pull request #5400 from lokedhs/master
...
When looking up a user by DN, use single scope
2013-11-04 00:29:14 -08:00
Dmitriy Zaporozhets
5b091c764c
Merge pull request #5512 from jhollingsworth/feature/missing-group-500-fix
...
Fixes 500 error when user types in wrong group name.
2013-11-03 23:55:56 -08:00
Dmitriy Zaporozhets
0f665f4176
Merge pull request #5519 from zzet/patch-3
...
Run tests in parallel on travis
2013-11-03 23:48:37 -08:00
Dmitriy Zaporozhets
8e006c64d3
Merge branch 'gitlab_shell_174_for_master' of /home/git/repositories/gitlab/gitlabhq
2013-11-04 07:07:25 +00:00
Elias Mårtenson
bc8a875df1
When looking up a user by DN, use single scope
...
The blocked? method is used to check whether a user exists in LDAP. Prior to this change, if the LDAP server had more objects below the one pointed to by the DN, those objects would also be picked up by the search, causing the method to determine the user should be blocked.
One case where this can happen is when using Active Directory and a user have a mobile phone assigned. In this case, Exchange will add an entry called ExchangeActiveSyncDevices under the users entry. The user-visible behaviour is then that a user loses Gitlab access when he enables a mobile device.
This fix sets the search scope to BaseObject in order to ensure that only the user itself is returned.
2013-11-03 21:51:10 +08:00
J.M
68da4154af
Support -ms-linear-gradient style for IE10+
2013-11-02 23:19:35 +01:00
Jacob Vosmaer
7265b4068d
Add security update info to 6.0-to-6.2.md
2013-11-02 17:32:14 +01:00
Jacob Vosmaer
81f69b5d31
Clarify upgrade steps
2013-11-02 17:24:43 +01:00
Jacob Vosmaer
5f0bb6cfa8
Add 5.1-to-5.4 update path
2013-11-02 17:13:38 +01:00
Jacob Vosmaer
faa6a34a17
Bump gitlab-shell in 5.4 and 6.2
2013-11-02 17:05:06 +01:00
Jacob Vosmaer
88c15909f9
Add security warnings to update docs
2013-11-02 16:49:26 +01:00
Andrew Kumanyaev
4637dc896c
Run tests in parallel on travis
2013-11-02 16:53:33 +03:00
Jason Hollingsworth
dfe19b2b84
Fixes 500 error when user types in wrong group name.
2013-11-01 11:29:37 -05:00
Jacob Vosmaer
9e31555afb
Use gitlab-shell 1.7.4
2013-11-01 16:38:55 +01:00
Dmitriy Zaporozhets
4c47a89fa5
Require gitlab-shell 1.7.4
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-01 16:58:24 +02:00
Johannes Schleifenbaum
d9deb24f3a
Preselect the current issue tracker with selected="selected"
...
The previous behavior was, that the first element of the select was
preselected, thus upon saving the project, the previous selected could
be overwritten.
2013-11-01 15:33:47 +01:00
Dmitriy Zaporozhets
592d1fabd6
Revert "Escape strings"
...
This reverts commit ce75f46bf7 .
2013-11-01 16:29:28 +02:00
Dmitriy Zaporozhets
482a39abb0
Revert "Best to escape strings not split them"
...
This reverts commit aca7f56fef .
2013-11-01 16:25:06 +02:00
Dmitriy Zaporozhets
c27e49e916
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2013-11-01 14:25:38 +02:00
Dmitriy Zaporozhets
b936314e6b
Merge branch '6_0_to_6_2' of /home/git/repositories/gitlab/gitlabhq
2013-11-01 12:17:22 +00:00
Jacob Vosmaer
fa6f198309
Bump gitlab-shell to 1.7.3
2013-11-01 13:05:26 +01:00
Dmitriy Zaporozhets
9c48f99592
Merge branch 'security-upgrade' of /home/git/repositories/gitlab/gitlabhq
2013-11-01 12:03:35 +00:00
Jacob Vosmaer
1cb18edf76
Merge pull request #5487 from perryfaro/fix-sidekiq-documentation
...
Change documentation about sidekiq
2013-11-01 03:56:31 -07:00
Perry Faro
5d98afb55b
Fix sidekiq start text in documentation and gitlab:check
2013-11-01 11:52:44 +01:00
Dmitriy Zaporozhets
844f8fd213
Show only first line of commit message on dashboard
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-01 09:36:59 +02:00
Dmitriy Zaporozhets
6055c615db
Mention GitLab CI 4.0 in CHANGELOG
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2013-11-01 09:28:30 +02:00
Dmitriy Zaporozhets
bfd9f81407
Mention security improvements in CHAGENLOG for 6.3
2013-11-01 09:25:03 +02:00
Dmitriy Zaporozhets
a27e4404db
Merge pull request #5435 from karlhungus/feature_search_namespace_name_and_public
...
Allow searching by namespace name, include public projects
2013-10-31 10:57:51 -07:00
Dmitriy Zaporozhets
9ab4539a62
Require gitlab-shell v1.7.3
2013-10-31 19:48:39 +02:00
Dmitriy Zaporozhets
b55f22afc0
Correctly escape search query
2013-10-31 16:35:06 +02:00
Dmitriy Zaporozhets
959863b92b
Merge pull request #5475 from nkukard/esc-strings
...
Escape strings
2013-10-31 05:57:11 -07:00
Dmitriy Zaporozhets
d55428b842
Shell escape code search
2013-10-31 11:25:08 +02:00
Dmitriy Zaporozhets
a1ded95491
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2013-10-31 10:42:48 +02:00
Dmitriy Zaporozhets
1040e88e56
Update gitlab_git to recent version
2013-10-31 10:42:15 +02:00
Nigel Kukard
aca7f56fef
Best to escape strings not split them
...
Signed-off-by: Nigel Kukard <nkukard@lbsd.net >
2013-10-31 07:34:11 +00:00