Dmitriy Zaporozhets
|
3e259ea8bc
|
Revert "Merge branch 'revert-satellites' into 'master'
"
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
|
2015-08-11 14:33:31 +02:00 |
|
Dmitriy Zaporozhets
|
5daf44b7c8
|
Merge branch 'revert-satellites' into 'master'
Revert satellites
Return satellites to master for 7.14
We remove satellites in next release (8.0)
See merge request !1136
|
2015-08-11 12:27:38 +00:00 |
|
Dmitriy Zaporozhets
|
3a63c00505
|
Fix file api tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-08-11 13:47:37 +02:00 |
|
Dmitriy Zaporozhets
|
9d029a05f1
|
Revert "Merge branch 'web-editor-rugged' into 'master'"
This reverts commit 5a1aa49b55, reversing
changes made to a675bea2c1.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-08-11 13:04:38 +02:00 |
|
Dmitriy Zaporozhets
|
9f10943c1a
|
Revert "Merge branch 'drop-satellites'"
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-08-11 10:28:42 +02:00 |
|
Stan Hu
|
c5648de230
|
Fix corrupted binary files when using API files endpoint
Add CHANGELOG for gitlab_git 7.2.9 updates
Closes #2219
|
2015-08-09 15:23:22 -07:00 |
|
Dmitriy Zaporozhets
|
a87989fb7d
|
Remove satellites
|
2015-07-15 15:45:57 +02:00 |
|
Dmitriy Zaporozhets
|
f40b99d02e
|
Merge branch 'master' into rubocop-for-tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
spec/features/issues_spec.rb
spec/models/forked_project_link_spec.rb
spec/models/hooks/service_hook_spec.rb
spec/models/hooks/web_hook_spec.rb
spec/models/project_services/hipchat_service_spec.rb
spec/requests/api/project_members_spec.rb
spec/requests/api/projects_spec.rb
spec/requests/api/system_hooks_spec.rb
spec/services/archive_repository_service_spec.rb
spec/support/matchers.rb
spec/tasks/gitlab/backup_rake_spec.rb
|
2015-06-23 10:44:03 +02:00 |
|
Robert Speicher
|
15a05be70d
|
Fix Style/Blocks cop violations
|
2015-06-22 16:00:54 -04:00 |
|
Robert Speicher
|
5a9ede4721
|
Update mock and stub syntax for specs
|
2015-06-22 12:13:46 +02:00 |
|
Dmitriy Zaporozhets
|
d684b11054
|
Remove unnecessary satellite files and add CHANGELOG item
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-06-02 12:07:00 +02:00 |
|
Dmitriy Zaporozhets
|
2c403dfd92
|
Remove file api tests which depend on old satellite logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-06-02 10:24:50 +02:00 |
|
Vinnie Okada
|
5f232b5687
|
Improve error messages when file editing fails
Give more specific errors in API responses and web UI flash messages
when a file update fails.
|
2015-02-22 16:01:49 -07:00 |
|
Jeroen van Baarsen
|
0c4a70a306
|
Updated rspec to rspec 3.x syntax
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
|
2015-02-12 19:17:35 +01:00 |
|
Dmitriy Zaporozhets
|
e4c6dbe35f
|
Fix api files specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-08-06 09:57:15 +03:00 |
|
Dmitriy Zaporozhets
|
2d87556847
|
Remove rails observers from application
|
2014-06-17 22:51:43 +03:00 |
|
Jeroen van Baarsen
|
5dd2f36ae1
|
Added API testing group
|
2014-04-11 21:45:56 +02:00 |
|
Dmitriy Zaporozhets
|
ddbe978041
|
Complete api files CRUD
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-02-18 12:27:02 +02:00 |
|
Dmitriy Zaporozhets
|
c227aa44f9
|
Make changes to tests
* project_with_code -> project
* project -> ermpty_project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-01-22 21:03:52 +02:00 |
|
Dmitriy Zaporozhets
|
3bab1bd4c1
|
Improve consistency: use file_path for API create/update/delete files
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2013-11-20 10:03:50 +02:00 |
|
Dmitriy Zaporozhets
|
a185cce5d3
|
Tests for delete file by API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2013-11-19 16:36:11 +02:00 |
|
Dmitriy Zaporozhets
|
c77d957b36
|
API: Edit file in repository
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2013-11-11 14:58:06 +02:00 |
|
Dmitriy Zaporozhets
|
e8bb32e623
|
Specs for Create file API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2013-11-07 18:53:35 +02:00 |
|