 Dmitriy Zaporozhets
|
2bfd4f4438
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
Conflicts:
VERSION
config/gitlab.yml.example
config/initializers/1_settings.rb
lib/api/entities.rb
lib/api/groups.rb
|
2015-01-21 17:05:31 -08:00 |
|
 Valery Sizov
|
ab7a79bf3b
|
developer can push to protected branches
|
2015-01-20 17:34:23 -08:00 |
|
|
Dmitriy Zaporozhets
|
3a9682a3d7
|
Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce
Conflicts:
VERSION
app/helpers/selects_helper.rb
app/models/project.rb
app/views/devise/sessions/new.html.haml
app/views/groups/_settings_nav.html.haml
app/views/layouts/nav/_admin.html.haml
app/views/profiles/keys/_key.html.haml
app/views/profiles/keys/index.html.haml
app/views/profiles/keys/show.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
config/routes.rb
db/schema.rb
doc/api/projects.md
features/steps/shared/paths.rb
|
2015-01-08 20:37:35 -08:00 |
|
 Marin Jankovski
|
84af3ceb9b
|
Add spec for developers can push to protected branches.
|
2014-12-26 11:41:04 +01:00 |
|
|
Dmitriy Zaporozhets
|
3bd66989de
|
Merge branch 'master' into ee-master
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
Gemfile
Gemfile.lock
VERSION
app/models/project.rb
app/models/user.rb
db/schema.rb
doc/install/installation.md
doc/update/6.x-or-7.x-to-7.5.md
doc/update/7.4-to-7.5.md
lib/gitlab/git_access.rb
spec/factories.rb
spec/lib/gitlab/git_access_spec.rb
|
2014-12-05 13:28:32 +02:00 |
|
|
Dmitriy Zaporozhets
|
06b7907c2a
|
Fix deploy keys permission check in internal api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-12-01 16:25:10 +02:00 |
|
 Valery Sizov
|
53bf52f191
|
Better message for failed pushes because of git hooks
Conflicts:
lib/gitlab/git_access.rb
spec/lib/gitlab/git_access_spec.rb
|
2014-11-18 13:10:07 +02:00 |
|
|
Valery Sizov
|
3058059c0a
|
Better message for failed pushes because of git hooks
|
2014-11-17 12:34:37 +02:00 |
|
|
Valery Sizov
|
3fcd75a911
|
Merge CE master into EE master
Conflicts:
Gemfile
VERSION
app/assets/javascripts/project.js.coffee
app/assets/javascripts/users_select.js.coffee
app/controllers/projects/services_controller.rb
app/models/project.rb
app/views/groups/edit.html.haml
features/project/service.feature
features/steps/project/services.rb
spec/models/concerns/mentionable_spec.rb
|
2014-11-13 17:05:12 +02:00 |
|
 Valery Sizov
|
b2e48f27a5
|
added some specs for gitlab_access class
|
2014-11-04 16:40:47 +02:00 |
|
 Ciro Santilli
|
71ed0ab069
|
Fix push not allowed to protected branch if
commit starts with 7 zeros.
|
2014-11-03 20:37:47 +01:00 |
|
|
Dmitriy Zaporozhets
|
15ba6ea105
|
Refactor Gitlab::GitAccess tests
|
2014-09-24 12:04:40 +03:00 |
|
|
Dmitriy Zaporozhets
|
3aa7132adc
|
Add GitAccess specs
|
2014-09-24 11:37:30 +03:00 |
|