7767ceef47
Merge branch 'master' into ide
...
* master: (177 commits)
Add changelog
Bump gitlab-shell version to 5.8.0 to fix Git for Windows 2.14
Make contextual sidebar collapsible
Fixed sidebar context header hover colors
Use correct `Environment`-class within `Gitlab` namespace
Remove gl.Activities from Commits page
Move `let` calls inside the `describe` block using them
Add `/assign me` alias support for assigning issuables to oneself
GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandError
Use `broken_storage` in the fs_shards_spec.
Eager load project creators for project dashboards
Memoize a user's personal projects count
Remove redundant query from User#recent_push
Improve checking if projects would be returned
Change spelling of gitlab-shell
Remove unused #tree-holder
Add custom linter for inline JavaScript to haml_lint
Rename user_can_admin? because it's more accurate
Synchronous zanata community contribution translation
Add Korean translation to i18n
...
2017-08-07 15:20:09 -05:00
5bf65c9306
Merge branch 'bvl-nfs-circuitbreaker' into 'master'
...
Circuitbreaker for storage paths
Closes #32207 , #33117 , gitlab-com/infrastructure#1946 , and gitlab-com/infrastructure#1775
See merge request !11449
2017-08-07 14:56:15 +00:00
81933cfdd3
Merge branch '32300__expose_more_attributes' into 'master'
...
Expose more attributes to unauthenticated GET /projects/:id
See merge request !13283
2017-08-07 09:52:37 +00:00
9c7602d104
Fix batch commit API
2017-08-04 19:25:35 +02:00
d41479266d
Add start_branch to files and commits APIs
2017-08-04 19:18:07 +02:00
3598e60bf2
Add a Circuitbreaker for storage paths
2017-08-04 15:38:48 +02:00
a723cba574
Avoid plucking Todo ids and use sub-queries instead
...
TodoService should not call `.select(&:id)` on todos, because this is
bad performance. So instead use sub-queries, which will result in a
single SQL query to the database.
https://docs.gitlab.com/ee/development/sql.html#plucking-ids
2017-08-03 16:31:05 +02:00
3c8b2ae168
Expose more attributes to unauthenticated GET /projects/:id
2017-08-03 16:42:11 +03:00
1018ab0516
Merge branch 'dm-api-current-user' into 'master'
...
Do not validate CSRF token in API unless needed
Closes #35705
See merge request !13256
2017-08-03 10:47:03 +00:00
14644d40e0
Do not validate CSRF token in API unless needed
2017-08-02 18:20:31 +02:00
1b117e7f2d
Merge branch 'api_project_events_target_iid' into 'master'
...
Expose target_iid in Events API
See merge request !13247
2017-08-02 10:34:35 +00:00
fb5b2d8d0e
Extending API for protected branches
2017-08-02 10:16:17 +00:00
24704acc77
Expose target_iid in Events API
2017-08-02 16:07:50 +09:00
1814fef814
Merge branch 'fix/sm/35825-api-specs-and-linting-failing-on-master' into 'master'
...
Fix "API specs and linting failing on master"
Closes #35825
See merge request !13227
2017-08-01 13:49:49 +00:00
90cb2aab38
Merge branch '28283-legacy-storage-format' into 'master'
...
[CE] Added Legacy Storage format
See merge request !13149
2017-08-01 12:24:24 +00:00
0c5fbaa72b
Add 204. Remove duplicated method.
2017-08-01 21:17:46 +09:00
8ffd40cee7
Merge branch '34519-extend-api-group-secret-variable' into 'master'
...
Extend API: Group Secret Variable
Closes #34519
See merge request !12936
2017-08-01 09:29:50 +00:00
abb878326c
Rename many path_with_namespace -> full_path
2017-08-01 07:26:58 +02:00
da967803cc
Merge branch '35599-fix-uncontrolled-default_url_options-overriding' into 'master'
...
Ensure Gitlab.config.gitlab.host/port and Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs
Closes #35599
See merge request !13126
2017-07-28 18:05:58 +00:00
e77e9b0077
Fixup POST /v3/:id/hooks and PUT /v3/:id/hooks/:hook_id
2017-07-28 16:27:10 +00:00
60797a42b4
Ensure Gitlab::Application.routes.default_url_options are set correctly in Capybara + :js specs
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-28 16:33:30 +02:00
56418e85ac
init
2017-07-28 18:13:29 +09:00
3f1b7b88c8
Merge branch 'tc-api-root-merge-requests' into 'master'
...
Add top-level /merge_requests API endpoint
Closes #28422
See merge request !13060
2017-07-28 07:38:58 +00:00
02b25598cb
Merge branch 'bvl-add-all-settings-to-api' into 'master'
...
Add all ApplicationSettings attributes to the API
See merge request !12851
2017-07-27 23:55:23 +00:00
39c39ae791
Modify/add some forgotten issues API documentation
...
Should have been part of !13004 .
2017-07-28 00:08:44 +02:00
d77088bb0b
Default /merge_request API endpoint to `scope=created-by-me`
...
This matches the behavior of the /issues endpoint.
2017-07-28 00:07:28 +02:00
d7505de8b3
Add top-level /merge_requests API endpoint
...
And add support for additional query parameters:
- `author_id`: Returns merge requests created by the given user `id`
- `assignee_id`: Returns merge requests assigned to the given user `id`
- `scope`: Return merge requests for the given scope: `created-by-me`, `assigned-to-me` or `all`
2017-07-27 23:34:57 +02:00
4e3e0dc8d4
DRY the branches API requirements definition
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 14:29:42 +02:00
649382b1c2
Fix the /projects/:id/repository/branches endpoint to handle dots in the branch name when the project full patch contains a `/`
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-27 14:29:31 +02:00
ef50875d3a
Merge branch '33601-add-csrf-token-verification-to-api' into 'master'
...
Resolve "Add CSRF token verification to API"
Closes #33601
See merge request !12154
2017-07-27 10:20:52 +00:00
5e56890e31
Merge branch 'tc-issue-api-assignee' into 'master'
...
Add author_id & assignee_id param to /issues API
Closes #29430
See merge request !13004
2017-07-27 09:59:38 +00:00
c11ed138a0
Remove deprecated `repository_storage` attribute
...
In favor of the new `repository_storages`
2017-07-27 11:49:27 +02:00
ea1012ccb4
Make the attribute list for application settings reusable
2017-07-27 11:49:27 +02:00
dcf4a2e83c
Rescue only from ActionController::InvalidAuthenticityToken
2017-07-26 11:25:10 +02:00
cc3a82bc8b
Add `rescue false`.
2017-07-26 11:05:44 +02:00
8ce8b21f67
Refactor CSRF protection
2017-07-26 11:05:44 +02:00
2902235099
Add CSRF token verification to API
2017-07-26 11:05:44 +02:00
fd0823d6e4
Merge branch '31129-jira-project-key-elim' into 'master'
...
Remove project_key from the JIRA configuration
Closes #31129
See merge request !12050
2017-07-26 08:26:47 +00:00
1c57299400
Remove project_key from the Jira configuration
2017-07-25 17:25:41 +02:00
ac948684fc
Merge branch '30634-protected-pipeline' into 'master'
...
Implement "Block pipelines on protected branches"
Closes #30634 , #34616 , and #33130
See merge request !11910
2017-07-25 15:04:23 +00:00
1162257080
Merge branch 'issue_34622' into 'master'
...
Group milestones API endpoint
Closes #34622
See merge request !12819
2017-07-25 12:52:47 +00:00
33dc5171e5
Resolve "More RESTful API: include resource URLs in responses"
2017-07-25 09:35:45 +00:00
d8798c907d
Allow query param scope for /issues API endpoint
2017-07-24 22:46:02 +02:00
8bf89cb4ab
Add author_id & assignee_id param to /issues API
...
Allow issues filtering on `author_id` and `assignee_id`.
2017-07-24 22:16:14 +02:00
7bee7b848a
Support both internal and external issue trackers
2017-07-24 08:13:43 +02:00
c5c9dce270
Add group milestones API endpoint
2017-07-21 11:00:00 -03:00
6b8ad689da
Update grape gem
...
New version of the gem returns 200 status code on delete with content
instead of 204 so we explicitly set status code to keep existing
behavior
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-07-20 16:33:18 +03:00
e9862a9900
Use struct instead of hash
2017-07-20 20:17:42 +08:00
a05bc477b9
Use hash to return multiple objects
2017-07-20 00:08:34 +08:00
b539951768
Ini
2017-07-19 20:50:05 +09:00
Mike Greiling
Sean McGivern
Rémy Coutable
Douwe Maan
Bob Van Landuyt
Toon Claes
Tony
Eric
sue445
Shinya Maeda
Kamil Trzciński
Gabriel Mazetto
Robert Speicher
Richard Clamp
Toon Claes
Bob Van Landuyt
blackst0ne
Jarka Kadlecova
Oswaldo Ferreira
Felipe Artur
Dmitriy Zaporozhets
Lin Jen-Shin