summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Implement top navigation concept for profile areaDmitriy Zaporozhets2016-04-1916-22/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main idea is to keep left sidebar static so user is not confused by changing context. Instead we put changing navigation with changing content in one main block Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | Merge branch 'document-feature-freeze' into 'master' Douwe Maan2016-04-211-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the feature freeze starting on the 18th cc @dzaporozhets @rspeicher @DouweM @rymai @axil See merge request !3698
| * | | | | | | | | | | | | | Document the feature freeze of stable branchesdocument-feature-freezeYorick Peterse2016-04-181-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#15183
* | | | | | | | | | | | | | | Merge branch 'issue_5838' into 'master' Rémy Coutable2016-04-218-16/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show project members only for members fixes #5838 See merge request !3752
| * | | | | | | | | | | | | | | 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 environments See merge request !3805
| * | | | | | | | | | | | | | | Attempt to create pg_trgm extension in migration for test/dev environmentsStan Hu2016-04-201-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15210
* | | | | | | | | | | | | | | | Merge branch 'fix/cross-project-labels-project-reference' into 'master' Grzegorz Bizon2016-04-213-31/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cross-project label ref used with invalid project When cross-project label reference was used with invalid project reference, `nil` was assigned to project variable which later caused an exception. Closes #15168 See merge request !3811
| * | | | | | | | | | | | | | | | 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
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15168
* | | | | | | | | | | | | | | | Merge branch 'addtap' into 'master' Kamil Trzciński2016-04-211-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add tap coverage example to project settings Previously, there were examples for Simplecov, pytest-cov, and phpunit. This adds an example for using the tap cli tool (https://github.com/tapjs/node-tap) Before: ![Screen_Shot_2016-04-07_at_9.57.32_AM](/uploads/2864d4cd4b5288565057263a435a851f/Screen_Shot_2016-04-07_at_9.57.32_AM.png) After: ![Screen_Shot_2016-04-07_at_9.57.16_AM](/uploads/62901e01c4ad6db86e4ced3dfebd20b9/Screen_Shot_2016-04-07_at_9.57.16_AM.png) See merge request !3597
| * | | | | | | | | | | | | | | | add tap coverage example to project settingsEvan Lucas2016-04-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, there were examples for Simplecov, pytest-cov, and phpunit. This adds an example for using the tap cli tool (https://github.com/tapjs/node-tap)
* | | | | | | | | | | | | | | | | Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-2153-473/+646
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci::Commit becomes a Pipeline object 1. Ci::Commit receives context: ref, :tag. 1. One Ci::Commit describes a one Pipeline 1. Pipeline is created from `.gitlab-ci.yml` 1. Pipeline is a ordered group of builds 1. We test MR against Pipeline 1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future) 1. We add a Pipeline Hook that will be triggered on Pipeline status change (future) 1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future) After merging that I'll prepare a separate MR that will unify naming, database columns, table names: ``` Ci::Commit -> Pipeline Ci::Build -> Build CommitStatus -> Job GenericCommitStatus -> ExternalJob ci_commits -> pipelines ci_builds -> jobs ``` This MR implements first 5 points. This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149. See merge request !3653
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipelineKamil Trzcinski2016-04-19122-523/+1840
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Cleanup changesKamil Trzcinski2016-04-1313-324/+307
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-13132-526/+4414
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Cleanup required migrationsKamil Trzcinski2016-04-135-10/+7
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add indexes concurrently on PostgreSQLKamil Trzcinski2016-04-131-3/+9
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix CiStatus implementation and testsKamil Trzcinski2016-04-133-12/+12
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Remove the use of default scope for BuildsKamil Trzcinski2016-04-132-315/+298
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Optimise CI status accessorKamil Trzcinski2016-04-122-41/+22
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Optimise CI status accessorKamil Trzcinski2016-04-125-1/+79
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix rubocopKamil Trzcinski2016-04-121-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix create_next_builds methodKamil Trzcinski2016-04-122-22/+3
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix rest of rspec and spinach testsKamil Trzcinski2016-04-126-15/+26
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-1169-321/+652
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/commits/_commit.html.haml
| * | | | | | | | | | | | | | | | | | | | Fix specsKamil Trzcinski2016-04-1128-194/+106
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Use Ci::Commit as PipelineKamil Trzcinski2016-04-1135-238/+326
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'disable_spellcheck_for_username_field' into 'master' Jacob Schatz2016-04-212-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable spellcheck and autocorrect for username field in admin page closes #14855 ## before ![Screen_Shot_2016-04-19_at_9.25.12_AM](/uploads/19387c4a11a879e9034a2179e932436e/Screen_Shot_2016-04-19_at_9.25.12_AM.png) ## after ![Screen_Shot_2016-04-19_at_9.25.47_AM](/uploads/60f4eba6a97201333dc64e46d625aac2/Screen_Shot_2016-04-19_at_9.25.47_AM.png) See merge request !3730
| * | | | | | | | | | | | | | | | | | | | | add item to chengelogArinde Eniola2016-04-201-0/+1
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | disable spellcheck and autocorrect for username field in admin pageArinde Eniola2016-04-201-3/+3
|/ / / / / / / / / / / / / / / / / / / / /