Douwe Maan
f81b55bd35
Merge branch 'refactor-scan' into 'master'
...
Improve readability of 'rake cache:clear' code
See merge request !2892
2016-02-20 01:05:00 +00:00
Kamil Trzcinski
46fd485c58
Fix API implementation
2016-02-19 18:30:43 +01:00
Kamil Trzcinski
921cfb66e6
Introduce API for serving the artifacts archive
2016-02-19 18:30:13 +01:00
Grzegorz Bizon
73c9d80bdc
Record user that erased a build through API
2016-02-19 17:24:59 +01:00
Grzegorz Bizon
7d5a182624
Use POST method instead of DELETE when erasing a build
...
Discussion:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3742042
2016-02-19 17:24:59 +01:00
Grzegorz Bizon
287cc838ce
Fix build api specs after rebase
2016-02-19 17:24:59 +01:00
Grzegorz Bizon
293999cabb
Fix name of build erasable, remove superfluous method from it
2016-02-19 17:24:59 +01:00
Grzegorz Bizon and Grzegorz Bizon
13f92521c2
Move build eraseable API to proper API context
2016-02-19 17:24:59 +01:00
Grzegorz Bizon and Grzegorz Bizon
df313634d0
Do not allow to modify build if it has been erased
2016-02-19 17:24:59 +01:00
Grzegorz Bizon and Grzegorz Bizon
21152d7d51
Use DELETE verb for erasing a build content
...
Also added API specs for that
2016-02-19 17:24:59 +01:00
Grzegorz Bizon and Grzegorz Bizon
6ca99bd899
And CI API endpoint where user can erase a build
2016-02-19 17:24:59 +01:00
Grzegorz Bizon
f6a91ccc5b
Move eraseable implementation to build concern
2016-02-19 17:24:03 +01:00
Grzegorz Bizon
9972abc295
Add methods to build eraseable component
2016-02-19 17:24:03 +01:00
Patricio Cano
75ad91822d
Merge branch 'saml-decoupling' into 'master'
2016-02-19 10:41:54 -05:00
Jacob Vosmaer
44e4f07037
Improve readability of 'rake cache:clear' code
2016-02-19 14:18:57 +01:00
Tomasz Maczukin
f2f6f77328
Rename Entities::ForkedFromProject to Entities::BasicProjectDetails
2016-02-19 13:18:49 +01:00
Tomasz Maczukin
e4d2f9972c
Change last_contact to contacted_at
2016-02-19 13:18:49 +01:00
Tomasz Maczukin
7ea60c8564
Replace Entities::RunnerProjectDetails with Entities::ForkedFromProject
2016-02-19 13:18:49 +01:00
Tomasz Maczukin
4ebadb77dd
iChange name and path to name_with_namespace and path_with_namespace in RunnerProjectDetails
2016-02-19 13:18:48 +01:00
Tomasz Maczukin
b36116f9ad
Move :runner_id param to POST body when enabling specific runner in project
2016-02-19 13:18:48 +01:00
Tomasz Maczukin
d1ac00aea3
Modify and fix output of delete and update of a runner
2016-02-19 13:18:48 +01:00
Tomasz Maczukin
24eed1c5c1
Modify runner projects selecting method in runners API
2016-02-19 13:18:48 +01:00
Tomasz Maczukin
36e7ffea5d
Fix runners filtering
2016-02-19 13:18:47 +01:00
Tomasz Maczukin
f21b15d5f5
Limit projects to user available projects if user is not an admin
2016-02-19 13:18:47 +01:00
Tomasz Maczukin
b58744cd93
Modify authentication check methods in runners API
2016-02-19 13:18:47 +01:00
Tomasz Maczukin
553bac57d0
Add token to runner details output in API
2016-02-19 13:18:47 +01:00
Tomasz Maczukin
f562a477f2
Add associated project info to runner details output
2016-02-19 13:18:47 +01:00
Tomasz Maczukin
81ced6f55b
Split /runners entrypoint to /runners and /runners/all
2016-02-19 13:18:47 +01:00
Tomasz Maczukin
b56ee397bb
Add some fixes in runners API documentation
2016-02-19 13:18:46 +01:00
Tomasz Maczukin
53f775ae6d
Fix runners filtering in API
2016-02-19 13:18:46 +01:00
Tomasz Maczukin
8c37f0ff30
Add missing methods documentation; fix rubocop reported violation
2016-02-19 13:18:46 +01:00
Tomasz Maczukin
d42ced44d9
Add feature to enable/disable runner in project
2016-02-19 13:18:46 +01:00
Tomasz Maczukin
128be3c010
Add basic runners management API
...
- add feature to list runners
- add feature to show runners details
- add feature to delete runner
- add feature to update runner
2016-02-19 13:18:46 +01:00
Douwe Maan
ad12f11f3e
Merge branch 'rs-emoji' into 'master'
...
Update Gemojione for new hotness ✨
Before | After
------ | -----
 | 
See merge request !2800
2016-02-19 08:11:02 +00:00
Patricio Cano
bb4fa3a185
Make new allow_single_sign_on feature backwards compatible
2016-02-18 17:02:43 -05:00
Patricio Cano
06376be56a
Decouple SAML authentication from the default Omniauth logic
2016-02-18 17:01:07 -05:00
Douwe Maan
873b0db220
Revert "Merge branch 'saml-decoupling' into 'master'
"
...
This reverts commit c04e22fba80feab326d5
2016-02-18 22:14:53 +01:00
Robert Speicher
c04e22fba8
Merge branch 'saml-decoupling' into 'master'
...
Decouple SAML authentication from the default Omniauth logic
Fixes gitlab-org/gitlab-ee#178
With this merge request SAML gets its own login logic and its own `User` class under `lib/gitlab/saml/` This is needed to give SAML more versatility over how the authorization process works and to pave the way for the development of a SAML group sync as outlined here: gitlab-org/gitlab-ee#118
See merge request !2782
2016-02-18 19:46:35 +00:00
Jacob Vosmaer
977fdbe830
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into cache-clear
2016-02-18 19:51:58 +01:00
Patricio Cano
f014127e17
Decouple SAML authentication from the default Omniauth logic
2016-02-18 13:22:19 -05:00
Jacob Vosmaer
9805fe1914
Use SCAN during 'rake cache:clear'
...
This allows 'rake cache:clear' to delete millions of keys without
choking. It requires Redis 2.8.0 or newer but we needed that already
anyway.
2016-02-18 16:55:19 +01:00
Grzegorz Bizon
8114786665
Fix builds scheduler when first build is allowed to fail
...
Before this fix when there was only one relevant, previous build and it
failed, but was allowed to fail, entire build had been marked as
skipped.
Closes #3192
2016-02-18 11:50:11 +01:00
Achilleas Pipinellis
66c03e0e29
Merge branch 'sqlite_rm_rf' into 'master'
...
Remove remaining sqlite method call
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13535
See merge request !2862
2016-02-17 19:21:05 +00:00
Achilleas Pipinellis
e5f9c4460f
Remove remaining sqlite method call
2016-02-17 20:34:54 +02:00
Jacob Vosmaer
64d8a38b54
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactor
2016-02-17 15:25:57 +01:00
Douwe Maan
28d42a33f3
Merge branch 'rs-issue-13469' into 'master'
...
Handle nil commits in Gitlab::PushDataBuilder.build
Closes #13469
See merge request !2825
2016-02-17 14:19:20 +00:00
Jacob Vosmaer
a0ccb0731b
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactor
2016-02-17 11:30:42 +01:00
Douwe Maan
bbbfdba0b9
Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master'
...
Add new data to project in push, issue, merge-request and note webhooks data
_Originally opened at !2738 by @bugagazavr._
- - -
**What does this MR do?**
Adds more data to hooks, makes repository data in all hook more dry ( use one hook_attrs method for repository data in all hooks )
**Are there points in the code the reviewer needs to double check?**
1. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/project.rb#L738
2. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/concerns/issuable.rb#L132
3. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/push_data_builder.rb#L52
4. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/note_data_builder.rb#L56
**Why was this MR needed?**
More information about user for push events, and more data about repositiry ( project )
**What are the relevant issue numbers?**
No
**Screenshots (if relevant)**
No
See merge request !2788
2016-02-16 13:08:36 +00:00
Robert Speicher
789aef7f26
Handle nil commits in Gitlab::PushDataBuilder.build
...
Closes #13469
2016-02-15 16:06:45 -05:00
Robert Speicher
447568d15f
Fix undefined method postgresql? during migration
2016-02-15 14:13:47 -05:00
Douwe Maan
Kamil Trzcinski
Grzegorz Bizon
Grzegorz BizonandGrzegorz Bizon
Patricio Cano
Jacob Vosmaer
Tomasz Maczukin
Douwe Maan
Robert Speicher
Achilleas Pipinellis
Robert Speicher