summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add db:migrate task to CItest-db-migrateDmitriy Zaporozhets2016-04-211-0/+5
* Merge branch 'fix/label-filters' into 'master' Douwe Maan2016-04-214-31/+62
|\
| * refactored specs based on feedbackfix/label-filtersJames Lopez2016-04-212-31/+18
| * use wait_for_ajax instead of sleeping for 2 days!James Lopez2016-04-211-10/+12
| * refactored specs, adding more scenariosJames Lopez2016-04-212-22/+34
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/label-filtersJames Lopez2016-04-21218-725/+5866
| |\
| * | final line missingJames Lopez2016-04-201-1/+1
| * | fix rubocop warningJames Lopez2016-04-201-2/+2
| * | udpated a few things based on MR feedback. Also added model specJames Lopez2016-04-205-176/+203
| * | fix other spec failuresJames Lopez2016-04-191-1/+1
| * | filter labels by including all filter titles as part of the queryJames Lopez2016-04-193-2/+172
* | | Merge branch 'revert-sentry-js' into 'master' Jacob Schatz2016-04-215-2482/+0
|\ \ \
| * | | Revert changelog tooJacob Schatz2016-04-211-1/+0
| * | | Revert "Merge branch 'sentry-js' into 'master' "Jacob Schatz2016-04-214-2481/+0
* | | | Merge branch 'top-navigation-concept' into 'master' Dmitriy Zaporozhets2016-04-2116-24/+30
|\ \ \ \ | |/ / / |/| | |
| * | | Layout navigation should respect layout width settingstop-navigation-conceptDmitriy Zaporozhets2016-04-202-9/+2
| * | | Fix tests and remove countersDmitriy Zaporozhets2016-04-192-2/+4
| * | | Implement top navigation concept for profile areaDmitriy Zaporozhets2016-04-1916-22/+33
* | | | Merge branch 'document-feature-freeze' into 'master' Douwe Maan2016-04-211-0/+19
|\ \ \ \
| * | | | Document the feature freeze of stable branchesdocument-feature-freezeYorick Peterse2016-04-181-0/+19
* | | | | Merge branch 'issue_5838' into 'master' Rémy Coutable2016-04-218-16/+37
|\ \ \ \ \
| * | | | | Add changelog entry and fix convention in a specissue_5838Felipe Artur2016-04-202-1/+2
| * | | | | Remove unused authorization from controllerFelipe Artur2016-04-203-8/+2
| * | | | | Projects members tab should follow visibility levelsFelipe Artur2016-04-185-39/+19
| * | | | | Show project members only for membersFelipe Artur2016-04-185-3/+49
* | | | | | Merge branch 'add-pg-trgrm-in-migration' into 'master' Yorick Peterse2016-04-211-0/+11
|\ \ \ \ \ \
| * | | | | | Attempt to create pg_trgm extension in migration for test/dev environmentsStan Hu2016-04-201-0/+11
* | | | | | | Merge branch 'fix/cross-project-labels-project-reference' into 'master' Grzegorz Bizon2016-04-213-31/+48
|\ \ \ \ \ \ \
| * | | | | | | Refactor banzai code that finds cross-project labelsGrzegorz Bizon2016-04-211-15/+21
| * | | | | | | Add Changelog entry for cross-project label fixGrzegorz Bizon2016-04-211-0/+1
| * | | | | | | Fix cross-project label ref with invalid projectGrzegorz Bizon2016-04-212-17/+27
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'addtap' into 'master' Kamil Trzciński2016-04-211-0/+3
|\ \ \ \ \ \ \
| * | | | | | | add tap coverage example to project settingsEvan Lucas2016-04-191-0/+3
* | | | | | | | Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-2153-473/+646
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipelineKamil Trzcinski2016-04-19122-523/+1840
| |\ \ \ \ \ \ \
| * | | | | | | | Fix CHANGELOGKamil Trzcinski2016-04-181-1/+1
| * | | | | | | | Fix rubocopKamil Trzcinski2016-04-181-1/+1
| * | | | | | | | Fix testsKamil Trzcinski2016-04-184-27/+28
| * | | | | | | | Make some logic less twistableKamil Trzcinski2016-04-176-10/+12
| * | | | | | | | Write specs for this featureKamil Trzcinski2016-04-167-19/+188
| * | | | | | | | Revert unneeded changesKamil Trzcinski2016-04-161-1/+1
| * | | | | | | | Rename CiStatus to StatusableKamil Trzcinski2016-04-167-9/+21
| * | | | | | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-16199-810/+3167
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix implementation of config_processor and ci_yaml_fileKamil Trzcinski2016-04-131-10/+15
| * | | | | | | | | Update handling of skipped statusKamil Trzcinski2016-04-133-17/+18
| * | | | | | | | | Simplify state update of Ci::Commit objectKamil Trzcinski2016-04-131-61/+11
| * | | | | | | | | Support skipped statusKamil Trzcinski2016-04-132-1/+4
| * | | | | | | | | Optimise Merge Request builds renderingKamil Trzcinski2016-04-133-6/+5
| * | | | | | | | | Fix migrations on MySQLKamil Trzcinski2016-04-131-1/+5
| * | | | | | | | | Update db/schema.rbKamil Trzcinski2016-04-131-1/+8