summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into pipeline-blocking-actionspipeline-blocking-actionsGrzegorz Bizon2017-03-0674-298/+1207
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (26 commits) Fix UserBasic Rename `/take` to `/take_ownership`, expose `owner` in `v3`. Update after review Fix values being called at Array instead of Hash Fix json response in branches controller Improve docs and specs related to pages artifacts Add MR fo changelog about removing pages artifacts Delete artifacts for pages unless expiry date is specified Lint doc Improved team selection Move foreign key to separate migration Fix import model attributes Update documentation and expose ID Introduce tests for pipeline triggers Fix trigger model Update db/schema Make triggers to be user aware Make Pipeline Triggers to be user aware Update triggers API Remove remnants of git annex ... Conflicts: db/schema.rb
| * Merge branch 'introduce-pipeline-triggers' into 'master' Sean McGivern2017-03-0625-183/+702
| |\ | | | | | | | | | | | | Improve pipeline triggers API See merge request !9713
| | * Fix UserBasicintroduce-pipeline-triggersKamil Trzcinski2017-03-061-1/+1
| | |
| | * Rename `/take` to `/take_ownership`, expose `owner` in `v3`.Kamil Trzcinski2017-03-064-7/+8
| | |
| | * Update after reviewKamil Trzcinski2017-03-063-1/+5
| | |
| | * Lint docKamil Trzcinski2017-03-051-2/+2
| | |
| | * Move foreign key to separate migrationKamil Trzcinski2017-03-053-3/+13
| | |
| | * Fix import model attributesKamil Trzcinski2017-03-052-0/+3
| | |
| | * Update documentation and expose IDKamil Trzcinski2017-03-054-109/+172
| | |
| | * Introduce tests for pipeline triggersKamil Trzcinski2017-03-056-52/+145
| | |
| | * Fix trigger modelKamil Trzcinski2017-03-051-1/+0
| | |
| | * Update db/schemaKamil Trzcinski2017-03-053-3/+6
| | |
| | * Make triggers to be user awareKamil Trzcinski2017-03-056-7/+31
| | |
| | * Make Pipeline Triggers to be user awareKamil Trzcinski2017-03-053-3/+28
| | | | | | | | | | | | | | | | | | | | | - they can have owner, - they can be edited, - they have description, - you can take ownership of them
| | * Update triggers APIKamil Trzcinski2017-03-055-17/+311
| | |
| * | Merge branch '1648-remove-remnants-of-git-annex-support' into 'master' Robert Speicher2017-03-0611-57/+11
| |\ \ | | | | | | | | | | | | | | | | Remove remnants of git annex See merge request !9508
| | * | Remove remnants of git annexPawel Chojnacki2017-03-0311-57/+11
| | | |
| * | | Merge branch '26384-improve-omnibus-mattermost-command-installation-flow' ↵Kamil Trzciński2017-03-069-31/+57
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Improve Omnibus-Mattermost Command installation flow" See merge request !9257
| | * | | Fix values being called at Array instead of HashZ.J. van de Weg2017-03-062-4/+4
| | | | |
| | * | | Improved team selectionLuke "Jared" Bennett2017-03-057-27/+53
| | | | | | | | | | | | | | | | | | | | Review changes
| * | | | Merge branch 'delete-pages' into 'master' Grzegorz Bizon2017-03-064-0/+31
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Delete artifacts for pages unless expiry date is specified See merge request !9716
| | * | | | Improve docs and specs related to pages artifactsGrzegorz Bizon2017-03-062-2/+4
| | | | | |
| | * | | | Add MR fo changelog about removing pages artifactsGrzegorz Bizon2017-03-061-1/+1
| | | | | |
| | * | | | Delete artifacts for pages unless expiry date is specifieddelete-pagesKamil Trzcinski2017-03-054-0/+29
| | | |_|/ | | |/| |
| * | | | Merge branch '28898-fix-search-branches-in-cherry-picking' into 'master' Sean McGivern2017-03-063-1/+28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix json response in branches controller Closes #28898 See merge request !9710
| | * | | | Fix json response in branches controllerGeorge Andrinopoulos2017-03-063-1/+28
| | | | | |
| * | | | | Merge branch 'etag-notes-polling' into 'master' Sean McGivern2017-03-0616-10/+348
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ETag to improve performance of issue notes polling Closes #27582 See merge request !9036
| | * | | | | Execute metrics initializer earlieretag-notes-pollingAdam Niedzielski2017-03-013-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that Gitlab::Metrics::RackMiddleware is added before Gitlab::EtagCaching::Middleware.
| | * | | | | Invalidate ETag cache when note changesAdam Niedzielski2017-03-012-0/+25
| | | | | | |
| | * | | | | Add middleware for ETag caching with RedisAdam Niedzielski2017-03-015-0/+269
| | | | | | |
| | * | | | | Remove query parameters from notes polling endpoint to make caching easierAdam Niedzielski2017-03-016-8/+52
| | | | | | |
| * | | | | | Merge branch 'change-colour-for-testing-fallback' into 'master' Rémy Coutable2017-03-061-5/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change language for testing colour fallback See merge request !9537
| | * | | | | | Change language for testing colour fallbackGeorg G2017-02-261-5/+5
| | | | | | | |
| * | | | | | | Merge branch ↵Rémy Coutable2017-03-065-12/+26
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28655-current-path-text-is-not-updated-after-setting-the-new-username' into 'master' Update profiles/account view to display new username Closes #28655 See merge request !9650
| | * | | | | | | Update profiles/account view to display new usernameMark Fletcher2017-03-025-12/+26
| | | | | | | | |
* | | | | | | | | Fix Rubocop offenses in commit status/build specsGrzegorz Bizon2017-03-062-12/+10
| | | | | | | | |
* | | | | | | | | Ignore optional actions when calculating warningsGrzegorz Bizon2017-03-063-3/+32
| | | | | | | | |
* | | | | | | | | Highligh info about optional action status in docsGrzegorz Bizon2017-03-061-0/+4
| | | | | | | | |
* | | | | | | | | Improve specs for detailed statuses with manual actionsGrzegorz Bizon2017-03-0614-57/+42
| | | | | | | | |
* | | | | | | | | Extend specs for code we use to calculate statusesGrzegorz Bizon2017-03-062-0/+40
| | | | | | | | |
* | | | | | | | | Extend pipeline retry specs with blocking actionsGrzegorz Bizon2017-03-061-11/+50
| | | | | | | | |
* | | | | | | | | Add some basic docs about blocking manual actionsGrzegorz Bizon2017-03-061-2/+15
| | | | | | | | |
* | | | | | | | | Add Changelog entry for blocking manual actionsGrzegorz Bizon2017-03-061-0/+4
| | | | | | | | |
* | | | | | | | | Add specs for presence of build commandsGrzegorz Bizon2017-03-061-0/+38
| | | | | | | | |
* | | | | | | | | Add specs for new pipeline and build action eventsGrzegorz Bizon2017-03-063-1/+32
| | | | | | | | |
* | | | | | | | | Improve specs for calculating pipeline result statusGrzegorz Bizon2017-03-061-2/+4
| | | | | | | | |
* | | | | | | | | Fix invalid description in commit status specsGrzegorz Bizon2017-03-062-2/+2
| | | | | | | | |
* | | | | | | | | Remove unused method that describes blocking jobGrzegorz Bizon2017-03-061-4/+0
| | | | | | | | |
* | | | | | | | | Ignore job by default if it is a manual actionGrzegorz Bizon2017-03-066-4/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to maintain backwards compatibility with configs created when manual actions were non-blocking. From now manual actions are blocking if configured with `allow_failure: false`, otherwise manual actions are optional, and their status is ignored.
* | | | | | | | | Add migration for manual actions with skipped statusGrzegorz Bizon2017-03-062-1/+20
| | | | | | | | |
View Lorry Controller Status