summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow to close environmentsKamil Trzcinski2016-10-065-8/+8
* Make environments to be close ableKamil Trzcinski2016-10-068-32/+45
* Add play typeKamil Trzcinski2016-10-061-1/+15
* Initial support for closing environmentsKamil Trzcinski2016-10-066-2/+58
* Fixes space between buttonsFilipa Lacerda2016-10-061-1/+1
* Updates failing testFilipa Lacerda2016-10-061-5/+5
* Adds close button to builds listFilipa Lacerda2016-10-064-8/+6
* Replaces destroy button with close oneFilipa Lacerda2016-10-061-1/+2
* Adds stop environment button to environments listFilipa Lacerda2016-10-064-3/+17
* Adds tabs to environments listFilipa Lacerda2016-10-061-0/+13
* Adds variables to controllerFilipa Lacerda2016-10-061-0/+5
* Adds new line in the end of the fileFilipa Lacerda2016-10-061-1/+1
* Adds link to close environment in a merge requestFilipa Lacerda2016-10-062-0/+12
* Merge branch 'jeroenj/gitlab-ce-group-milestone-archived-projects'Rémy Coutable2016-10-062-19/+3
|\
| * Don't include archived projects when creating group milestonesJeroen Jacobs2016-10-052-2/+3
* | Merge branch '18663-perform-housekeeping-with-proper-connection-pool-size' in...Yorick Peterse2016-10-063-1/+46
|\ \
| * | Use higher size on Gitlab::Redis connection pool on Sidekiq serversPaco Guzman2016-10-063-1/+46
* | | Merge branch '21337-introduce-git-strategy-none' into 'master' Achilleas Pipinellis2016-10-061-8/+26
|\ \ \
| * | | Document GIT_STRATEGY=noneNick Thomas2016-10-051-8/+26
* | | | Merge branch 'docs/ca-feedback' into 'master' Achilleas Pipinellis2016-10-062-15/+73
|\ \ \ \ | |_|/ / |/| | |
| * | | Clarify some more the Cycle Analytics workflow exampleAchilleas Pipinellis2016-10-061-16/+22
| * | | Add example Cycle Analytics workflowdocs/ca-feedbackAchilleas Pipinellis2016-10-041-5/+53
| * | | Take a new screenshot for Cycle AnalyticsAchilleas Pipinellis2016-10-031-0/+0
| * | | Clarify that the `production` environment is case-sensitiveAchilleas Pipinellis2016-10-031-1/+1
| * | | Clarify Plan and Code stages moreAchilleas Pipinellis2016-10-031-2/+2
| * | | Clarify what it means Test stage is not calculated in TotalAchilleas Pipinellis2016-10-031-1/+4
| * | | Fix markdown URL linkAchilleas Pipinellis2016-10-031-1/+1
| * | | Clarify the Plan to Code stages in Cycle Analytics docsAchilleas Pipinellis2016-09-281-3/+4
* | | | Merge branch 'feature/improve-async-pipeline-processing' into 'master' Kamil Trzciński2016-10-0610-12/+80
|\ \ \ \
| * | | | Do not return false in commit status transitionfeature/improve-async-pipeline-processingGrzegorz Bizon2016-10-043-7/+5
| * | | | Add specs for new async ci pipeline workersGrzegorz Bizon2016-10-042-0/+44
| * | | | Fix hipchat service specs after changes in pipelineGrzegorz Bizon2016-10-042-4/+3
| * | | | Update order of build transition callbacksGrzegorz Bizon2016-10-044-24/+22
| * | | | Fix pipeline fixtures and calls to removed methodGrzegorz Bizon2016-10-043-3/+3
| * | | | Extract updating pipeline status to async workerGrzegorz Bizon2016-10-043-13/+24
| * | | | Use internal commit status API to check if finishedGrzegorz Bizon2016-10-041-2/+2
| * | | | Fix async pipeline and remove unrelated changesGrzegorz Bizon2016-10-046-26/+16
| * | | | Make pipeline processing asynchronousKamil Trzcinski2016-10-037-23/+51
* | | | | Fix CHANGELOG and wrong conflict resolutionRémy Coutable2016-10-062-9/+1
* | | | | Merge branch 'cs-flay-no-allow-failure' into 'master' Rémy Coutable2016-10-061-3/+1
|\ \ \ \ \
| * | | | | Don't allow flay to fail.cs-flay-no-allow-failureConnor Shea2016-10-051-3/+1
* | | | | | Add 8.12.4 CHANGELOG entriesRémy Coutable2016-10-061-7/+15
* | | | | | Merge remote-tracking branch 'dev/master'Rémy Coutable2016-10-065-5/+184
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix/id-claim-import-issue' into 'master' Douwe Maan2016-09-305-5/+184
| |\ \ \ \ \ \
| | * | | | | | updated attribute cleaner to use allowed keyword and reject attributesJames Lopez2016-09-271-3/+3
| | * | | | | | Prevent claiming associated model IDs via import and added relevant specsJames Lopez2016-09-275-5/+184
* | | | | | | | Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-0635-44/+193
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge branch 'raven-headers' into 'security' Rémy Coutable2016-10-055-4/+9
| |\ \ \ \ \ \ \
| | * | | | | | | Don't send Private-Token headers to SentryJacob Vosmaer2016-10-045-4/+9
| |/ / / / / / /
| * | | | | | | Merge branch 'fix/export-project-file-permissions' into 'security' Douwe Maan2016-10-0310-7/+27
| |\ \ \ \ \ \ \