summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added missing content and improved layout23051-restore-missing-university-contentSean Packham2016-10-071-103/+179
* 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
| |\ \ \ \ \ \
| | * | | | | | fix export project file permissions issueJames Lopez2016-09-3010-7/+27
| |/ / / / / /
| * | | | | | Merge branch 'fix/escape-builds-commands-in-ci-linter' into 'security' Robert Speicher2016-09-282-2/+36
| |\ \ \ \ \ \
| | * | | | | | Escape HTML nodes in builds commands in ci linterGrzegorz Bizon2016-09-262-2/+36
| * | | | | | | Merge branch '22435-no-api-state-change-via-rails-session' into 'security' Douwe Maan2016-09-2810-25/+63
| |\ \ \ \ \ \ \
| | * | | | | | | Convert label creation from API to controller endpointNick Thomas2016-09-238-18/+26
| | * | | | | | | API: disable rails session auth for non-GET/HEAD requestsNick Thomas2016-09-232-7/+37
| * | | | | | | | Merge branch '18028-respect-fork-project' into 'security' Rémy Coutable2016-09-2810-7/+45
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Add a CHANGELOG entryNick Thomas2016-09-271-0/+1
| | * | | | | | | Enforce the fork_project permission in Projects::CreateServiceNick Thomas2016-09-279-7/+44
| |/ / / / / / /
* | | | | | | | Merge branch 'flash-cherry-pick-error' into 'master' Fatih Acet2016-10-052-7/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Make flash-alert background transparent to match flash-notice.flash-cherry-pick-errorBryce Johnson2016-10-052-7/+3
* | | | | | | | | Merge branch 'revert-c676283b' into 'master' Fatih Acet2016-10-0527-144/+638
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix bad merge conflict resolution.Fatih Acet2016-10-051-2/+0
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...Fatih Acet2016-10-059-67/+66
| |\ \ \ \ \ \ \ \ \
View Lorry Controller Status