Commit Graph

1266 Commits

Author SHA1 Message Date
35674fcd47 Merge remote-tracking branch 'upstream/master' into 15041-Add-Custom-CI-Config-Path
* upstream/master: (12506 commits)
  Update CHANGELOG.md for 9.3.2
  Update architecture.md
  Fix changelog entry file extension
  Fix head pipeline stored in merge request for external pipelines
  updated gitlab-ci.yml to compile locale
  Ignore JSON files generated from PO files
  Update mmap2 gem tha disables mmap_obj.gsub! as current implementation uses method that is no longer part of Ruby API
  Disable rainbow during SimpleExecutor specs to have consistence
  Slightly refactor pipeline schedules form in preparation for additions
  Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter submits twice and refreshes page"
  Make the SimpleExecutor rescue exceptions in the executing Checks
  Resolve "Unable to access edit comment from dropdown menu in certain screen sizes"
  Update changelog item
  revert removal of requestAnimationFrame and move to a separate MR/discussion
  rename getEmojiCategoryMap and remove unnecessary parameter
  Action Buttons on Prio Labels working again by setting pointer events to none on…
  Remove 'contains' option from Commit.find_all
  Remove Gitlab::Git::Repository#find_all
  Use latest chrome and chrome driver in GitLab QA
  Polish sidebar toggle
  ...
2017-06-28 15:53:12 +08:00
5fa9d6a17d Rename FLippable to FeatureGate and make flipper_group and user mutually exclusive
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-27 18:59:51 +02:00
b4d325c80c Allow the feature flags to be enabled/disabled with more granularity
This allows to enable/disable a feature flag for a given user, or a
given Flipper group (must be declared statically in the `flipper.rb`
initializer beforehand).

Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-27 18:59:51 +02:00
18ef5be6c4 Merge branch 'dt/printing-to-api' into 'master'
add printing_merge_request_link_enabled to API

See merge request !12240
2017-06-21 09:00:57 +00:00
0e7478064f Re-instate is_admin flag in users API is current user is an admin 2017-06-20 14:54:29 +00:00
09aaeb118b Moved Open source license templates link into alphabetical order 2017-06-19 18:08:15 -07:00
1cd1bab3af add printing_merge_request_link_enabled to API 2017-06-19 13:33:15 -04:00
9fe6c2b2c2 Merge branch 'add-since-and-until-params-to-issuables' into 'master'
add created_after and created_before params to issuables

Closes #32901

See merge request !12151
2017-06-19 12:13:27 +00:00
ef633d2478 add since and until params to issuables 2017-06-18 15:43:51 -07:00
83a9a472b3 Accept image for avatar in user API 2017-06-16 23:52:15 +03:00
5f42009f8d Merge branch 'docs/branches' into 'master'
Document the Delete Merged Branches functionality

See merge request !12217
2017-06-16 14:31:46 +00:00
8fb33b8f01 Add docs for personal access tokens 2017-06-14 08:40:21 +02:00
a4aa448c2d Documentation bugfix of invalid JSON payload example of Create a commit with multiple files and actions 2017-06-13 18:31:13 +11:00
4ccd799832 Accept image for avatar in project API 2017-06-09 22:49:57 +03:00
07fdabbc3a Merge branch 'dturner/grammar' into 'master'
Improve the grammar of the API docs

See merge request !11863
2017-06-09 16:10:06 +00:00
5b645e6492 Clarify API V5 being a compatability layer on top of GraphQL
[ci skip]
2017-06-08 13:37:26 -07:00
a982a45349 Merge branch 'sh-document-road-to-graphql' into 'master'
Add text documenting that v5 of the API will be GraphQL

See merge request !11998
2017-06-08 13:32:54 +00:00
0dbf4b87ee Document the Delete Merged Branches functionality
* Note that protected branches will not be part of the deletion
2017-06-08 18:52:56 +08:00
acdd1bf7c9 Merge branch '28607-forking-and-configuring-project-via-api-works-very-unreliable' into 'master'
Confirm Project forking behaviour via the API

Closes #28607

See merge request !11931
2017-06-08 06:33:19 +00:00
d540699b77 Add text documenting that v5 of the API will be GraphQL
[ci skip]
2017-06-07 22:38:35 -07:00
563ea34692 Merge branch '12910-snippets-description' into 'master'
Support descriptions for snippets

Closes #31894

See merge request !11071
2017-06-07 09:26:48 +00:00
2e311d9d1a Support uploads for newly created personal snippets 2017-06-07 07:52:41 +02:00
1110def8e2 Introduce optimistic locking support via optional parameter last_commit_id on File Update API 2017-06-06 13:55:29 +00:00
cff037fd25 Confirm Project forking behaviour via the API
* It's unclear that the forking operation can still be ongoing
* `import_status` is available in Project Entity to determine status
2017-06-06 21:34:10 +08:00
3c15f0eae7 Accept a username for User-level Events API 2017-06-06 20:16:41 +08:00
ad3e180ed3 Introduce an Events API
* Meld the following disparate endpoints:
 * `/projects/:id/events`
 * `/events`
 * `/users/:id/events`
+ Add result filtering to the above endpoints:
 * action
 * target_type
 * before and after dates
2017-06-06 20:16:41 +08:00
a17bfd368f Resolve "API: Environment info missed" 2017-06-06 10:23:29 +00:00
70b927a55c Merge branch 'projects-api-import-status' into 'master'
Expose import_status in Projects API

Closes #19646

See merge request !11851
2017-06-02 22:16:54 +00:00
c2516115e3 Expose import_status in Projects API 2017-06-02 15:35:51 -04:00
c890c6aaf2 Allow users to be hard-deleted from the API 2017-06-02 18:28:12 +01:00
5250b7a6cd Improve the grammar of the API docs 2017-06-01 15:52:17 -04:00
3cc138d824 Merge branch 'master' into '24196-protected-variables'
# Conflicts:
#   db/schema.rb
2017-06-01 07:25:48 +00:00
671284ba37 Add feature toggles through Flipper 2017-05-31 21:06:01 +00:00
554426ddca Merge remote-tracking branch 'upstream/master' into 24196-protected-variables
* upstream/master: (141 commits)
  Add Documentation for GIT_CHECKOUT variable
  Ui improvements for count badges and permission badges
  Rename the other jobs
  Update jobs_spec for changes from builds_spec
  Update docs related to protected actions
  Add changelog for protected branches abilities fix
  Ask for an example project for bug reports
  Center loading spinner in issuable filters
  Fix chat commands specs related to protected actions
  Fix builds controller specs related to protected actions
  Fix pipeline retry specs related to protected actions
  Fix environment model specs related to protected actions
  Fix build factory specs related to protected actions
  Fix job play service specs related to protected actions
  Fix play status specs related to protected actions
  Fix deploy chat command specs for protected actions
  Fix environment specs related to protected actions
  Use another scope to add the - prefix, feedback:
  Fix pipeline processing specs related to protected actions
  Fix build entity specs related to protected actions
  ...
2017-06-01 03:39:47 +08:00
21b3f200a0 Merge branch '33000-tag-list-in-project-create-api' into 'master'
Add tag_list param to project api

Closes #33000

See merge request !11799
2017-05-31 12:59:34 +00:00
afc1fac039 Merge remote-tracking branch 'upstream/master' into 24196-protected-variables
* upstream/master: (89 commits)
  Revert "Merge branch 'grpc-1.3.4' into 'master'"
  Return nil when looking up config for unknown LDAP provider
  Avoid crash when trying to parse string with invalid UTF-8 sequence
  Enable Gitaly by default in GitLab 9.3
  Don’t create comment on JIRA if link already exists
  Disable sub_group_issuables_spec.rb for mysql
  Fix math rendering on blob pages
  Add changelog
  Don't allow to pass a user to ProjectWiki#http_url_to_repo
  Revert "Merge branch '1937-https-clone-url-username' into 'master'
"
  Fix bottom padding for build page
  Fix /unsubscribe slash command creating extra todos
  Fix omniauth-google-oauth2 dependencies in Gemfile.lock
  Update looks job log
  'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled
  Fix spec for Members::AuthorizedDestroyService
  31616-add-uptime-of-gitlab-instance-in-admin-area
  Set head pipeline when creating merge requests
  Create a separate helper to check if we show particular tab on a search page
  Add performance deltas between app deployments on Merge Request widget
  ...
2017-05-31 19:07:27 +08:00
0684073d1e Add tag_list param to project api 2017-05-31 09:02:33 +03:00
4464c22d6d Support descriptions for snippets 2017-05-31 07:17:03 +02:00
0e0e278196 Fix document according to the new change 2017-05-30 23:55:09 +09:00
c91292b61f Improve document 2017-05-30 23:55:09 +09:00
20c26eaf93 FIx doc lint 2017-05-30 23:55:09 +09:00
0b2fd147ec Update doc with latest entity 2017-05-30 23:55:09 +09:00
359b17611d Add doc 2017-05-30 23:55:08 +09:00
a7349560b2 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled 2017-05-30 15:35:49 +11:00
bd66bf08b5 API and doc for protected variables 2017-05-25 19:49:46 +08:00
e5658927c8 Reword 2017-05-18 14:40:36 +00:00
35ae511411 Match v3 case 2017-05-18 13:51:27 +00:00
86a3fbd9b6 Make API v3 removal date more clear/match blog post 2017-05-18 13:47:22 +00:00
18a2928732 Add "API" to all respective headings (h1s) 2017-05-18 08:49:03 +00:00
572118853c #32340 - Include mention of "manual" scope in jobs api doc 2017-05-16 15:17:30 +00:00