Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-08-11Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets
This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
2015-08-11Merge branch 'revert-satellites' into 'master' Dmitriy Zaporozhets
Revert satellites Return satellites to master for 7.14 We remove satellites in next release (8.0) See merge request !1136
2015-08-11Fix file api testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11Revert "Merge branch 'web-editor-rugged' into 'master'"Dmitriy Zaporozhets
This reverts commit 5a1aa49b5533593dc4c6de82279fe44f5f15616c, reversing changes made to a675bea2c1c1d5d6923cb97b8714eb72d4e4ff9b. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets
This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-10Fix corrupted binary files when using API files endpointStan Hu
Add CHANGELOG for gitlab_git 7.2.9 updates Closes #2219
2015-08-07Add `Group#add_*` convenience methodsRobert Speicher
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
2015-08-04Merge branch 'master' into drop-satellitesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04Fix merge api and specDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-30Fix docsDouwe Maan
2015-07-29Add ability to manage user email addresses via the API.Douwe Maan
2015-07-28Merge branch 'fix-api-mr-notes-ordering' into 'master'Douwe Maan
Return comments in created order in merge request API Closes #1832 See merge request !985
2015-07-22Clearing the entire Redis cache may be too expensive; just useStan Hu
the repository expire_cache method
2015-07-22Fix 404 error in files view after deleting the last file in a repositoryStan Hu
Closes #1362
2015-07-17Add specs for gitlab ci service validity.Marin Jankovski
2015-07-17Fix failing specs after adding format verification for token and project url ↵Marin Jankovski
in gitlab ci service.
2015-07-17Return comments in created order in merge request APIStan Hu
Closes #1832
2015-07-15Remove satellitesDmitriy Zaporozhets
2015-07-09Merge branch 'rs-dev-issue-2372' into 'master'Dmitriy Zaporozhets
Filter by issues/merge requests without a milestone Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2372 See merge request !886
2015-07-07Merge branch 'settings-via-api' into 'master'Dmitriy Zaporozhets
API to set application settings for admin Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !934
2015-07-07Use stub_application_setting in a few more specsRobert Speicher
These specs also failed when run by themselves before this change, so we've likely got some kind of cross-test contamination going on.
2015-07-06Add tests and improve logicDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-06Add docs and empty specs for applicaiton settings APIDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-03Allow user to be blocked and unblocked via the APISteve Norman
2015-06-24Add 2FA status to user admin APIStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/9391
2015-06-23Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets
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-23Fix Style/AlignHash cop violationsStan Hu
2015-06-22Fix Style/Blocks cop violationsRobert Speicher
2015-06-22Fix Style/SpaceInsideHashLiteralBraces cop violationsRobert Speicher
These fixes were performed automatically by Rubocop's `-a` flag.
2015-06-22Merge branch 'revert-mr-state-names'Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/merge_requests.rb
2015-06-22Merge requests API returns closed for closed and merged for merged.Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22Fix part of api specs for rubocopDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22Change `to_not` calls to `not_to`Robert Speicher
Both work, but now we're consistent across the entire app.
2015-06-22Fix `raise_error` without an argument deprecation warningsRobert Speicher
2015-06-22Update mock and stub syntax for specsRobert Speicher
2015-06-14Change `foo.should` syntax to `expect(foo).to` in specsRobert Speicher
2015-06-05Merge branch 'maser/gitlab-ce-order-commit-comments-in-api' into 'master'Dmitriy Zaporozhets
Order commit comments in API chronologically When fetching commit comments via API, the comments were not ordered, but just returned in the order Postgresql finds them. Now the API always returns comments in chronological order. Same as !628 but with CI See merge request !768
2015-06-04Merge branch 'make-namespaces-api-available-to-all-users' into 'master'Dmitriy Zaporozhets
Make namespace API available to all users ### What does this MR do? This MR makes it possible for a user to query namespaces to which he/she has access. Also, it adds documentation for the existing API. ### Why was this MR needed? Even though the `groups` API exists, it might still be useful to have an endpoint that tells the namespace type (e.g. `user` vs. `group`), especially if a user has access to a number of different projects. ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/9328 See merge request !708
2015-06-03Fix tests and increase delay time before remove repositoryDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-02Remove unnecessary satellite files and add CHANGELOG itemDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-02Remove file api tests which depend on old satellite logicDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-29Disable changing of the source branch in merge request update APIStan Hu
2015-05-28Make namespace API available to all usersStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/9328
2015-05-21Update ffaker gemRobert Speicher
Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`.
2015-05-16Allow to configure gitlab_shell_secret locationJakub Jirutka
2015-05-14Add order option for projects APIValery Sizov
2015-05-08Order commit comments in API chronologicallyMartin Luder
When fetching commit comments via API, the comments were not ordered, but just returned in the order Postgresql finds them. Now the API always returns comments in chronological order.
2015-05-03Merge branch 'api-iid' of https://github.com/jubianchi/gitlabhq into ↵Dmitriy Zaporozhets
jubianchi-api-iid
2015-05-03Merge pull request #9066 from jirutka/fix-6417Dmitriy Zaporozhets
Fix #6417: users with group permission should be able to create groups via API
2015-05-02Query issues, merge requests and milestones with their IID through APIjubianchi