Merge branch 'api' of https://github.com/NARKOZ/gitlabhq
Conflicts: Gemfile.lock
Showing
... | @@ -18,6 +18,7 @@ gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git" | ... | @@ -18,6 +18,7 @@ gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git" |
gem 'grack', :git => "https://github.com/gitlabhq/grack.git" | gem 'grack', :git => "https://github.com/gitlabhq/grack.git" | ||
gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git" | gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git" | ||
gem "grape" | |||
gem "stamp" | gem "stamp" | ||
gem "kaminari" | gem "kaminari" | ||
gem "haml-rails" | gem "haml-rails" | ||
... | ... |
lib/api.rb
0 → 100644
lib/api/entities.rb
0 → 100644
lib/api/helpers.rb
0 → 100644
spec/api/projects_spec.rb
0 → 100644
spec/api/users_spec.rb
0 → 100644
Please register or sign in to comment