Commit Graph
24078 Commits
Author SHA1 Message Date
Rubén DávilaandRobert Speicher e1a3c8cd1a Don't show last event message on top when reverse branch was created under the hood. 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher f4ff2ba57b Check target branch exists before creating revert MR. 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher 207522f923 Some refactor to the revert commit creation.
* Not required to run hooks since it's an internal commit
2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher f56ee9d3b9 Save merge commit id when MR is merged 2016-02-19 13:14:49 -05:00
Rubén DávilaandRobert Speicher 720e52d9d9 Add merge_commit_sha column to merge_requests. 2016-02-19 13:14:48 -05:00
Rubén DávilaandRobert Speicher d7511a4b04 Create reverse branch and generate MR with new branch. #3409 2016-02-19 13:14:48 -05:00
Rubén DávilaandRobert Speicher d3c2437328 Add new endpoint and button to revert merge. #3409 2016-02-19 13:14:48 -05:00
Grzegorz Bizon 96158aa6b3 Merge branch 'ci/remove-builds' into 'master'
Make it possible to erase build content (artifacts, trace)

This feature makes it possible to remove build content - build artifacts and build traces.

- [x] Remove artifacts
- [x] Remove metadata
- [x] Remove build traces
- [x] Wait for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 this to be merged
- [x] Fix the permissions after the merge

Closes #3421

See merge request !2560
2016-02-19 17:04:07 +00:00
Rémy Coutable 0a71920f65 Merge branch 'axil/gitlab-ce-mention-project-in-fork-notice' into 'master'
Mention project name in fork notice

_Originally opened at !1186 by @axil._

- - -

I missed this one in !1070

See merge request !2897
2016-02-19 16:35:53 +00:00
Grzegorz Bizon 73c9d80bdc Record user that erased a build through API 2016-02-19 17:24:59 +01:00
Grzegorz Bizon fb62196f43 Remove doubled entry from Changelog introduced by merge 2016-02-19 17:24:59 +01:00
Grzegorz Bizon 36971a5046 Fix feature tests for erasing build 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 08b8f48929 Improve build view for erased build details 2016-02-19 17:24:59 +01:00
Grzegorz Bizon 86a49dfb88 Move build erasable implementation from concern to model
Discussion:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3659905
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 c4f6a93593 Fix Changelog entry for builds erasable after a rebase 2016-02-19 17:24:59 +01:00
Grzegorz Bizon cf38608486 Use button groups in build summary for consistency 2016-02-19 17:24:59 +01:00
Grzegorz Bizon 73faddedbf Change build erase path to make it consistent with API 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 ec5c3c029c Add API documentation for build erase endpoint 2016-02-19 17:24:59 +01:00
Grzegorz Bizon b14c9fcdbb Fix date in alert saying that build has been erased 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon 13f92521c2 Move build eraseable API to proper API context 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon a2eac4684c Add Changelog entry for build eraseable
[ ci skip]
2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon df313634d0 Do not allow to modify build if it has been erased 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz 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 BizonandGrzegorz Bizon 6ca99bd899 And CI API endpoint where user can erase a build 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon c850ceec5d Create method that checks if build has been erased
+ minor improvements
2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon 433de7baca Remove boolean erase column from ci build and foreign key 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon ede451c851 Show information indicating that build has been erased 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon 2c7f36f430 Update relevant build fields when build is erased 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon bae3701073 Add build eraseable columns to ci builds table 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon bd7c52c734 Add feature specs for build erase button 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon f3e92fb4d0 Make CI build eraseable only if build is completed 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon c8102d938b Add build eraseable feature implementation 2016-02-19 17:24:03 +01:00
Grzegorz BizonandGrzegorz Bizon 89b181204c Use build artifacts trait in build specs 2016-02-19 17:24:03 +01:00
Grzegorz BizonandGrzegorz Bizon 5e1edd372f Add artifacts trait to build factory in specs 2016-02-19 17:24:03 +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
Grzegorz Bizon c1affed196 Add build remove button to build summary view 2016-02-19 17:24:03 +01:00
Achilleas PipinellisandRémy Coutable c6e0db03eb Mention project name in fork notice 2016-02-19 17:06:14 +01:00
Patricio Cano 75ad91822d Merge branch 'saml-decoupling' into 'master' 2016-02-19 10:41:54 -05:00
Kamil Trzciński 1817b766b2 Merge branch 'ci/api-runners' into 'master'
Add runners API

References #4264

See merge request !2640
2016-02-19 13:23:28 +00:00
Jacob Schatz c21c8825d8 Merge branch 'issue_11872' into 'master'
Put project visibility icon next to title

Fixes #11872

See merge request !2885
2016-02-19 12:26:59 +00:00
Tomasz Maczukin f2f6f77328 Rename Entities::ForkedFromProject to Entities::BasicProjectDetails 2016-02-19 13:18:49 +01:00
Tomasz Maczukin 982368815e Add CHANGELOG entry 2016-02-19 13:18:49 +01:00
Tomasz Maczukin 49d5c35b69 Fix old usages of ci_runner factory 2016-02-19 13:18:49 +01:00
Tomasz Maczukin acfe25edc0 Refactorize ci_runner factory and let definitions in runners API spec 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