Commit Graph
779 Commits
Author SHA1 Message Date
Douwe Maan 9664424cab Merge branch 'ci/api-projects' into 'master'
Extend projects API with CI data

Reference #4264 

See merge request !2303
2016-01-13 13:32:35 +00:00
Tomasz Maczukin df54828580 Add some fixes after review 2016-01-13 12:47:11 +01:00
Tomasz Maczukin d44653da1f Add some fixes after review 2016-01-13 12:20:59 +01:00
Tomasz Maczukin efb3395b4f Remove blank line 2016-01-12 19:32:44 +01:00
Tomasz Maczukin ab2c6cc01f Add some fixes 2016-01-12 18:32:18 +01:00
Gabriel Mazetto ac6a10f3e8 Codestyle changes 2016-01-12 12:29:10 -02:00
Tomasz Maczukin 5dcfd7d067 Add TODO notice to build trace feature in CI API 2016-01-11 15:49:25 +01:00
Tomasz Maczukin a30377c6f1 Merge branch 'master' into ci/api-builds
* master: (143 commits)
  Only load autocomplete data when actually needed
  Check for current user
  Add pencil icon to edit group settings
  Issue #5817 wording of the web hooks updated on issue and merge events
  use JavaScript instead of CoffeeScript in Views, the reason #9819
  Before project save ensure that a runners_token exists
  Fix Error 500 when visiting build page of project with nil runners_token
  Remove outdated gitlab-git-http-server reference from Install doc
  Fix typo in build page of projects
  Update docs for shared runner default settings
  Disable "Already Blocked" button in admin abuse report page
  Add CHANGELOG entry for reply-by-email fix
  Use WOFF versions of SourceSansPro
  Clean up document on adding users to a project
  Refactor ZenMode
  Fix caching issue where build status was not updating in project dashboard
  Add a CHANGELOG entry for The Most Important Feature of All Time(TM)
  changes verb `references` to noun `reference`.
  fixes new branch button positioning, when visible and not visible container
  DRY up upload and download services
  ...
2016-01-11 15:34:29 +01:00
Tomasz Maczukin fc4108b38b Modify CI features in projects API 2016-01-11 15:27:20 +01:00
Tomasz Maczukin 4e70f2519b Update ./doc/api/builds.md 2016-01-11 11:15:04 +01:00
Tomasz Maczukin 96bbc145f3 Change commit builds URL in builds API 2016-01-11 10:20:45 +01:00
Tomasz Maczukin 4eb27d7c72 Add some modifications to builds API and specs 2016-01-08 23:33:45 +01:00
Tomasz Maczukin 1eb7b5ee8d Modify entities for builds API 2016-01-08 22:57:42 +01:00
Robert Speicher af68897acd Merge branch 'api-project-upload' into 'master'
Add API project upload endpoint

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317

See merge request !2329
2016-01-08 20:29:43 +00:00
Gabriel Mazetto 6e7db8e23e Prevent ldap_blocked users from being blocked/unblocked by the API 2016-01-08 16:26:04 -02:00
Tomasz Maczukin 549a2fa787 Modify builds scope filtering in builds API 2016-01-08 14:01:31 +01:00
Robert Schilling 4c90ed52fe Delete tag via API 2016-01-08 10:10:04 +01:00
Tomasz Maczukin e0ec69d919 Change 'trigger_id' to 'token' as resource ID in triggers API 2016-01-07 18:48:33 +01:00
Tomasz Maczukin b604459068 Update ./doc/api 2016-01-07 14:10:49 +01:00
Tomasz Maczukin b60c146267 Change :variable_id to :key as resource ID in API 2016-01-07 13:49:38 +01:00
Douwe Maan 1886d727f7 Add API project upload endpoint 2016-01-07 13:37:14 +01:00
Tomasz Maczukin ba9799b42f Update ./doc/api 2016-01-07 10:39:02 +01:00
Douwe Maan c0849101e6 Merge branch 'master' into merge-when-build-succeeds-unchecked 2016-01-06 13:06:01 +01:00
Dmitriy Zaporozhets 797c2326c3 Merge branch 'feature/detailed-user-endpoint' of https://gitlab.com/Michi302/gitlab-ce 2016-01-06 10:51:17 +01:00
Tomasz Maczukin a862ade55b Update ./doc/api/ 2016-01-05 16:36:14 +01:00
Douwe Maan 097faeb481 Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running 2016-01-05 16:30:03 +01:00
Tomasz Maczukin 962b97d813 Merge branch 'master' into ci/api-builds
* master: (75 commits)
  Fix grammar
  Clarify the key generation step
  Remove misleading `ssh-dsa`
  markdown fixes
  markdown fixes
  Add `AbuseReport#notify`
  Make AbuseReportMailer responsible for knowing if it should deliver
  Redirect back to user profile page after abuse report
  Redesign the AbuseReports index
  Don't notify users twice if they are both project watchers and subscribers
  Restructure logo JS to use `setInterval`
  Decrease the logo sweep delay
  Correct the logo ID names
  Update CHANGELOG
  Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notification
  Remove jquery.blockUI.js plugin
  rempves tests for "you have master access" text
  Revert "Merge branch 'rs-remove-jquery-blockui' into 'master'
"
  removes footer message about access to project
  remove public field from namespace and refactoring
  ...
2016-01-05 15:53:34 +01:00
Tomasz Maczukin 0a21731e3b Add ci fields in project create/update feature API 2016-01-05 15:00:25 +01:00
Tomasz Maczukin f60bceb988 Add CI data to projcet entity 2016-01-05 13:21:21 +01:00
Tomasz Maczukin 8675664655 Get show details feature to triggers API 2016-01-05 12:25:16 +01:00
Tomasz Maczukin 49c8bf4e9b Add create feature to triggers API 2016-01-05 11:47:54 +01:00
Tomasz Maczukin f00607431c Add delete feature to triggers API 2016-01-05 11:32:21 +01:00
Tomasz Maczukin d9da81f736 Add triggers feature to API 2016-01-04 16:44:09 +01:00
Stan Hu 086cfc8685 Fix API project lookups when querying with a namespace with dots
Attempting to use the /projects/:id API by specifying :id in
"namespace/project" format would always result in a 404 if the namespace
contained a dot.

The reason? From http://guides.rubyonrails.org/routing.html#specifying-constraints:

"By default the :id parameter doesn't accept dots - this is because the dot is
used as a separator for formatted routes. If you need to use a dot within an
:id add a constraint which overrides this - for example id: /[^\/]+/ allows
anything except a slash."

Closes https://github.com/gitlabhq/gitlabhq/issues/9573
2016-01-03 15:08:44 -08:00
Tomasz Maczukin 628297fe56 Remove incorrect 'default' values from method description 2015-12-31 23:01:28 +01:00
Tomasz Maczukin 16bd4df083 Fix a typo in method description 2015-12-31 22:59:06 +01:00
Tomasz Maczukin 937567b767 Add create feature to variables API 2015-12-31 22:30:07 +01:00
Tomasz Maczukin c5177dd5e2 Add missing 'not_found' checks in variables API 2015-12-31 17:03:11 +01:00
Tomasz Maczukin 0d014feb1d Add delete feature to variables API 2015-12-31 16:56:03 +01:00
Tomasz Maczukin a692ce1c07 Add update feature for variables API 2015-12-31 16:26:55 +01:00
Tomasz Maczukin ea4777ff50 Add features for list and show details of variables in API 2015-12-31 16:26:54 +01:00
Tomasz Maczukin 44dd4782f0 Merge branch 'master' into ci/api-builds
* master: (108 commits)
  Fix project transfer e-mail sending incorrect paths in e-mail notification
  Update CHANGELOG
  Use Gitlab::CurrentSettings for InfluxDB
  Write to InfluxDB directly via UDP
  Strip newlines from obfuscated SQL
  Add hotfix that allows to access build artifacts created before 8.3
  note votes methids implementation
  When reCAPTCHA is disabled, allow registrations to go through without a code
  Downcased user or email search for avatar_icon.
  Handle missing settings table for metrics
  Fix broken link in permissions page [ci skip]
  reCAPTCHA is configurable through Admin Settings, no reload needed.
  Fixed syntax in gitlab.yml.example
  Move InfluxDB settings to ApplicationSetting
  Fix spelling mistake, thanks Connor.
  Restart settings are moved too.
  Hotfix for builds trace data integrity
  add issue weight to contributing
  Added host option for InfluxDB
  Fixed styling of MetricsWorker specs
  ...
2015-12-30 17:09:26 +01:00
Tomasz Maczukin d2601211a0 Add specs for build listings in API 2015-12-29 23:12:36 +01:00
Tomasz Maczukin b2fbeb377d Remove changes in 'paginate' helper 2015-12-28 17:01:28 +01:00
Tomasz Maczukin 8d4555037a Add cancel/retry endpoints to build API 2015-12-28 16:38:29 +01:00
Tomasz Maczukin e7d0746d93 Add 'not_found' notifications in build/trace details 2015-12-28 16:38:02 +01:00
Michi302 141b8b67ff Make single user API endpoint return Entities::User instead of Entities::UserBasic 2015-12-28 15:50:44 +01:00
Tomasz Maczukin d398e78ea0 Add endpoint for getting builds for a specific commit 2015-12-28 15:49:13 +01:00
Tomasz Maczukin f4cff4dcd0 Modify build pagination to use 'paginate' helper 2015-12-28 13:33:35 +01:00
Tomasz Maczukin f39959d00a Add some fixes to builds API 2015-12-28 13:09:51 +01:00