summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update kubernetes.mdpatch-15Mark Pundsack2017-04-101-1/+1
|
* Add link to environments on kubernetes.mdMark Pundsack2017-04-071-1/+1
|
* Merge branch 'docs/ci-variables-remove-my-email' into 'master' Achilleas Pipinellis2017-04-071-1/+1
|\ | | | | | | | | Remove wrong user email from CI variables example output See merge request !10554
| * Remove wrong user email from CI variables example outputAchilleas Pipinellis2017-04-071-1/+1
| | | | | | | | [ci skip]
* | Merge branch 'optimise-builds' into 'master' Sean McGivern2017-04-074-1/+43
|\ \ | | | | | | | | | | | | | | | | | | Optimise Pipelines > Jobs index controller Closes #27389 See merge request !10546
| * | Count number of queriesKamil Trzcinski2017-04-074-1/+43
| | |
* | | Merge branch 'karma-failure-fix' into 'master' Jacob Schatz2017-04-072-7/+6
|\ \ \ | | | | | | | | | | | | | | | | Fixed duplicate jQuery AJAX spyon See merge request !10531
| * | | Fixed duplicate jQuery AJAX spyonkarma-failure-fixPhil Hughes2017-04-072-7/+6
| | | |
* | | | Merge branch 'bvl-fix-project-ci-status-cache' into 'master' Kamil Trzciński2017-04-0713-123/+155
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix invalidating Project build status cache to often See merge request !10313
| * | | | Use `Ci::ExpirePipelineCacheService` to set `ProjectPipelinestatus`bvl-fix-project-ci-status-cacheBob Van Landuyt2017-04-074-17/+10
| | | | |
| * | | | Take the ref of a pipeline into account when caching statusBob Van Landuyt2017-04-072-17/+29
| | | | |
| * | | | Rename `ProjectBuildStatus` -> `ProjectPipelineStatus`Bob Van Landuyt2017-04-077-7/+7
| | | | |
| * | | | Wrap updating of cache after pipeline transition in class methodBob Van Landuyt2017-04-074-7/+21
| | | | |
| * | | | Update project build status cache when transitioningBob Van Landuyt2017-04-075-12/+16
| | | | |
| * | | | Rename Ci::PipelineStatus -> Ci::ProjectBuildStatusBob Van Landuyt2017-04-078-93/+102
| | | | |
* | | | | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-0783-295/+1464
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Protected Tags Closes #18471 See merge request !10356
| * | | | Show Flash message above Tags list18471-restrict-tag-pushes-protected-tagsKushal Pandya2017-04-073-2/+8
| | | | |
| * | | | Documentation for protected tagsJames Edwards-Jones2017-04-0710-3/+69
| | | | |
| * | | | Protected tags changes from backend maintainer reviewJames Edwards-Jones2017-04-073-3/+5
| | | | |
| * | | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-06253-1835/+6699
| |\ \ \ \ | | | | | | | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/import_export/all_models.yml
| * \ \ \ \ Merge branch '18471-restrict-tag-pushes-protected-tags' of ↵Kushal Pandya2017-04-07176-267/+2021
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into 18471-restrict-tag-pushes-protected-tags
| | * \ \ \ \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-06176-267/+2021
| | |\ \ \ \ \
| | * | | | | | Fix within('#new_protected_tag') in protected tags specJames Edwards-Jones2017-04-061-1/+1
| | | | | | | |
| * | | | | | | Fix selector for form wrapperKushal Pandya2017-04-071-2/+2
| |/ / / / / /
| * | | | | | Fix projected import failing on missing relationsJames Edwards-Jones2017-04-061-1/+5
| | | | | | |
| * | | | | | Fixes as per feedbackKushal Pandya2017-04-068-20/+20
| | | | | | |
| * | | | | | Protected Tags backend review changesJames Edwards-Jones2017-04-0625-74/+125
| | | | | | | | | | | | | | | | | | | | | Added changelog
| * | | | | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-061427-7678/+75710
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss
| * | | | | | | Add constructor doc, toggle helperKushal Pandya2017-04-061-8/+18
| | | | | | | |
| * | | | | | | Update bundle path for Protected Tags bundleKushal Pandya2017-04-061-1/+1
| | | | | | | |
| * | | | | | | Import Protected Tags classesKushal Pandya2017-04-061-2/+3
| | | | | | | |
| * | | | | | | Re-export classes using ES6 `export`Kushal Pandya2017-04-061-5/+5
| | | | | | | |
| * | | | | | | Convert to pure ES6 classKushal Pandya2017-04-065-146/+132
| | | | | | | |
| * | | | | | | Bundle renamed to `index.js`Kushal Pandya2017-04-061-0/+0
| | | | | | | |
| * | | | | | | Added ProtectedTag to import/export son and safe_model_attributesJames Edwards-Jones2017-04-043-0/+36
| | | | | | | |
| * | | | | | | Fixed UserAccess#can_create_tag? after create_access_levels renameJames Edwards-Jones2017-04-042-3/+3
| | | | | | | |
| * | | | | | | Renamed ProtectedTag push_access_levels to create_access_levelsJames Edwards-Jones2017-04-0419-68/+68
| | | | | | | |
| * | | | | | | Cleaned up duplication with ProtectedRefAccess concernJames Edwards-Jones2017-04-045-55/+27
| | | | | | | |
| * | | | | | | Attempt to fix import/export of push_access_levels for protected tagsJames Edwards-Jones2017-04-043-1/+9
| | | | | | | |
| * | | | | | | Cleanup & tests for UserAccess#can_create_tag?James Edwards-Jones2017-04-044-9/+76
| | | | | | | |
| * | | | | | | Fixed developers_can_push in RepoBranch API entityJames Edwards-Jones2017-04-042-6/+8
| | | | | | | |
| * | | | | | | Protected Tags prevents all updates instead of just force pushes.James Edwards-Jones2017-04-043-52/+49
| | | | | | | | | | | | | | | | | | | | | | | | This only changes behaviour for masters, as developers are already prevented from updating/deleting tags without the Protected Tags feature
| * | | | | | | Fix typos in ProtectedRef concern and whitespace detected by rubocopJames Edwards-Jones2017-04-034-5/+2
| | | | | | | |
| * | | | | | | Created ProtectedRefsController to reduce Tags/Branches duplicationJames Edwards-Jones2017-04-033-80/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes ProtectedBranches#create flash errors bug due to typo in 'flash[:alert] = @protected_branches.errors'
| * | | | | | | Clean up non TODO rubocop errorsJames Edwards-Jones2017-04-036-14/+13
| | | | | | | |
| * | | | | | | Use delegation in ProtectedRef concernJames Edwards-Jones2017-04-031-12/+2
| | | | | | | |
| * | | | | | | Removed protected_tags_arrayJames Edwards-Jones2017-04-033-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | This memorized array appears to originally come from https://gitlab.com/gitlab-org/gitlab-ee/commit/19c2c90ccac86a21eb4266b9a5972162f917f692 which has a commit message of ‘fix warnings’. Without any comments on the original pull request I think we can safely get rid of it unless warnings re-appear.
| * | | | | | | Moved default_branch_protected? out of ProjectJames Edwards-Jones2017-04-032-13/+7
| | | | | | | |
| * | | | | | | Moved Project#protected_branch? to ProtectedBranch, similar for tagsJames Edwards-Jones2017-04-0316-81/+94
| | | | | | | |
| * | | | | | | Extracted ProtectableDropdown to clean up Project#open_branchesJames Edwards-Jones2017-04-035-46/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes it clear this is only used in dropdowns, instead of cluttering up Project class. Since we only care about branch names, it is also possible to refactor out a lot of the set/reject logic. A benchmark on Array/Set subtraction favoured using Arrays. This was with 5000 ‘branches’ and 2000 ‘protections’ to ensure a similar comparison to the commit which introduced using Set for intersection. Comparison: array subtraction: 485.8 i/s set subtraction: 128.7 i/s - 3.78x slower
View Lorry Controller Status