 Dmitriy Zaporozhets
|
9b140b22fb
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee
Conflicts:
Gemfile.lock
app/helpers/tab_helper.rb
config/routes.rb
db/schema.rb
|
2015-02-04 18:19:22 -08:00 |
|
|
Dmitriy Zaporozhets
|
e890582681
|
Rubocop enabled for: Use spaces inside hash literal braces
|
2015-02-02 20:36:54 -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
|
7240150c89
|
Forward the messages in api response.
|
2014-12-30 15:17:46 +01:00 |
|
|
Marin Jankovski
|
3257f8fcce
|
Do not allow adding users via api if member lock is enabled.
|
2014-12-15 13:25:31 +01:00 |
|
|
Dmitriy Zaporozhets
|
6558e52d90
|
More fixes to project members api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-09-15 12:01:45 +03:00 |
|
|
Dmitriy Zaporozhets
|
77c64a9b36
|
Replace project_access attribute with access_level in specs and API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-09-15 11:36:50 +03:00 |
|
|
Dmitriy Zaporozhets
|
c69b8e0459
|
Huge replace of old users_project and users_group references
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-09-14 19:32:51 +03:00 |
|
|
Dmitriy Zaporozhets
|
7c60713e82
|
Move project members api to separate file
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-03-17 13:44:54 +02:00 |
|