 Dmitriy Zaporozhets
|
b165b097f5
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
LICENSE
VERSION
app/controllers/omniauth_callbacks_controller.rb
app/helpers/application_helper.rb
app/helpers/merge_requests_helper.rb
app/models/group.rb
app/models/project.rb
app/models/project_team.rb
app/views/admin/groups/edit.html.haml
app/views/groups/_projects.html.haml
app/views/groups/edit.html.haml
db/schema.rb
doc/install/installation.md
doc/integration/README.md
lib/gitlab/git_access.rb
lib/gitlab/markdown.rb
spec/helpers/merge_requests_helper.rb
spec/models/merge_request_spec.rb
|
2014-06-17 10:53:44 +03:00 |
|
|
Dmitriy Zaporozhets
|
d8c7efa626
|
Dont allow git tag rewrite/removal unless you are master
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-05-30 16:26:45 +03: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 |
|
 Marin Jankovski
|
95ef8f9756
|
Merge remote-tracking branch 'ce/master'
Conflicts:
VERSION
doc/install/installation.md
doc/integration/README.md
doc/integration/external-issue-tracker.md
lib/gitlab/markdown.rb
spec/lib/gitlab/ldap/ldap_access_spec.rb
|
2014-05-21 13:10:37 +02:00 |
|
 Jacob Vosmaer
|
34fd557055
|
Move user access check to Gitlab::UserAccess
|
2014-05-15 10:22:59 +02:00 |
|
|
Jacob Vosmaer
|
797e807249
|
Use LDAP::Access.open to reuse the LDAP connection
|
2014-05-14 19:04:00 +02:00 |
|
|
Dmitriy Zaporozhets
|
fae2e540b6
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
Gemfile.lock
README.md
VERSION
app/assets/javascripts/application.js
db/schema.rb
doc/install/installation.md
doc/update/4.2-to-5.0.md
doc/update/5.0-to-5.1.md
doc/update/5.1-to-5.2.md
doc/update/5.2-to-5.3.md
doc/update/5.4-to-6.0.md
doc/update/6.0-to-6.1.md
doc/update/6.0-to-6.7.md
lib/gitlab/git_access.rb
|
2014-04-10 13:34:56 +03:00 |
|
|
Dmitriy Zaporozhets
|
5350492842
|
Fix support for force_push
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-04-03 15:03:45 +03:00 |
|
|
Dmitriy Zaporozhets
|
713815df14
|
Skip git hooks if oldrev or newrev is nil
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-03-26 17:24:53 +02:00 |
|
 Steven Thonus
|
8b35b20837
|
first setup to protect protected branched to force updates
|
2014-03-25 22:33:14 +01:00 |
|
|
Dmitriy Zaporozhets
|
c55d2345ee
|
Fix http clone for public project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-03-21 15:04:21 +02:00 |
|
|
Dmitriy Zaporozhets
|
7dd18a3ec8
|
Fix http clone for public project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-03-21 14:52:30 +02:00 |
|
|
Dmitriy Zaporozhets
|
3fa2dd1107
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-6-7-rc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
Gemfile.lock
VERSION
lib/gitlab/git_access.rb
|
2014-03-21 12:22:43 +02:00 |
|
|
Dmitriy Zaporozhets
|
b8dc5d2c5f
|
Implement 2 git hooks: tagf removal and commit message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-03-20 14:59:01 +02:00 |
|
|
Dmitriy Zaporozhets
|
19c28822ef
|
Add Gitlab::GitAccess class to resolve auth issues during pull/push
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-03-20 10:16:17 +02:00 |
|
|
Dmitriy Zaporozhets
|
b4bef5e646
|
Add Gitlab::GitAccess class to resolve auth issues during pull/push
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-03-19 21:05:21 +02:00 |
|