summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use a custom Devise failure app to handle unauthenticated .zip requestsrs-issue-12944Robert Speicher2016-03-083-18/+52
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944
* Merge branch 'branch-tag-count-methods' into 'master' Robert Speicher2016-03-086-14/+155
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use dedicated methods for counting branches and tags This started out as "Lets add two methods to count and cache some data" and ended up in a clean-up/fix of some existing code. The two problems were: 1. Different code was used for adding/removing branches/tags via Git and the UI 2. The code used for the UI didn't have any RSpec tests, and I couldn't find any Spinach tests either (though grepping for Spinach stuff is hard) This MR addresses the following: 1. `Repository#branch_count` and `Repository#tag_count` are used to count and cache the number of branches/tags, these methods are then used on the branches/commits/tags pages. 2. `Repository#add_tag`, `Repository#add_branch`, `Repository#rm_tag` and `Repository#rm_branch` now all the appropriate before/after hook methods instead of calling a random single cache expiration method. This ensures caches are properly flushed when adding/removing tags/branches via the UI. 3. RSpec tests were added for the above methods. This fixes gitlab-org/gitlab-ce#13459 See merge request !3128
| * Call after_create_branch in Repository#add_branchbranch-tag-count-methodsYorick Peterse2016-03-082-1/+8
| | | | | | | | | | This ensures the right caches are flushed when adding a branch via the UI, instead of only flushing this one random cache.
| * Call the right hooks in Repository#add_tagYorick Peterse2016-03-082-1/+13
| | | | | | | | | | This ensures Repository#add_tag calls Repository#before_push_tag instead of just 1 random cache expiration method.
| * Added specs for Repository#rm_tagYorick Peterse2016-03-081-0/+11
| |
| * Call the right hooks when removing branchesYorick Peterse2016-03-082-2/+19
| | | | | | | | | | | | This ensures that Repository#rm_branch calls before_remove_branch/after_remove_branch instead of just 1 random cache expiration method.
| * Cache & flush tag/branch countsYorick Peterse2016-03-086-10/+104
| | | | | | | | | | | | | | The methods used for this are Repository#tag_count and Repository#branch_count which cache their output in Redis as well as memoizing it in an instance variable. Both methods have a corresponding methods/hooks to flush the caches at the right time.
* | Merge branch 'evuez/gitlab-ce-add-info-user-api' into 'master' Robert Speicher2016-03-084-0/+7
|\ \ | | | | | | | | | | | | | | | | | | Expose User#last_sign_in_at and User#confirmed_at for admins Closes #840 See merge request !3090
| * | Add fields to GET /users/* API endpoints for adminsevuez/gitlab-ce-add-info-user-apievuez2016-03-044-0/+7
| | | | | | | | | | | | | | | | | | | | | Added fields are last_sign_in_at and confirmed_at. They are available for GET /users/ and GET /users/:id for admins. Closes #840
* | | Merge branch ↵Robert Speicher2016-03-082-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'improve/3102-memoize-group-instance-variable-in-admin-groups-controller' into 'master' Remove instance variable `@group` multiple assignment See merge request !3127
| * | | Remove instance variable @group multiple assignmentYatish Mehta2016-03-082-1/+2
| | | |
* | | | Merge branch 'remove-duplicate-cache_store-in-test-config' into 'master' Robert Speicher2016-03-081-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate 'cache_store' configuration in test environment [ci skip] See merge request !3061
| * | | | Remove duplicate 'cache_store' configuration in test environmentremove-duplicate-cache_store-in-test-configRémy Coutable2016-03-021-2/+0
| | | | |
* | | | | Merge branch 'sql-guide' into 'master' Robert Speicher2016-03-082-0/+220
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Added basic SQL guidelines This is mostly based on the various changes I've made over the past few months. See merge request !3091
| * | | | Added basic SQL guidelinessql-guideYorick Peterse2016-03-082-0/+220
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-03-081-10/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update slack instructions the previous instructions no longer apply, there is no "Incoming WebHooks" row anymore. luckily there exists direct link to web hooks, so the previous steps aren't even neccessary See merge request !3052
| * | | | | update slack instructionsElan Ruusamäe2016-03-011-10/+2
| | | | | |
* | | | | | Merge branch 'patch-2' into 'master' Achilleas Pipinellis2016-03-081-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | add link to web hooks docs Add link to web hooks docs on custom hooks docs page. See merge request !3082
| * | | | | add link to web hooks Ben Bodenmiller2016-03-031-1/+1
| | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | Merge branch 'master' into 'master' Yorick Peterse2016-03-087-0/+58
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | adds language names to projects list [image attached] See merge request !3000
| * | | | | adds test for git push service for updating the language of the projecttiagonbotelho2016-03-072-3/+22
| | | | | |
| * | | | | add my mr to changelogtiagonbotelho2016-03-071-0/+1
| | | | | |
| * | | | | moves the main_language update logic to git push servicetiagonbotelho2016-03-072-8/+12
| | | | | |
| * | | | | removes the test file of the project spec for invalid methodtiagonbotelho2016-03-071-8/+0
| | | | | |
| * | | | | removes automatic setting of main_language to project for it to set a main ↵tiagonbotelho2016-03-071-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | language you have now to make a commit to the project
| * | | | | fixes typotiagonbotelho2016-03-071-1/+1
| | | | | |
| * | | | | removes redundant selftiagonbotelho2016-03-071-1/+1
| | | | | |
| * | | | | implements test to simulate empty repotiagonbotelho2016-03-071-0/+6
| | | | | |
| * | | | | adds tests and fixes some broken code to main language mrtiagonbotelho2016-03-073-3/+17
| | | | | |
| * | | | | adds swp and swo to gitignore and improves migration for project main_languagetiagonbotelho2016-03-074-24/+20
| | | | | |
| * | | | | removes unused methods that I forgottiagonbotelho2016-03-072-16/+0
| | | | | |
| * | | | | implements project languages saving them onto the databasetiagonbotelho2016-03-073-0/+33
| | | | | |
| * | | | | moves method to repository modeltiagonbotelho2016-03-072-7/+13
| | | | | |
| * | | | | changes if ! to unless and now asks for language instead of languagestiagonbotelho2016-03-071-3/+4
| | | | | |
| * | | | | adds cache to languages listtiagonbotelho2016-03-071-4/+4
| | | | | |
| * | | | | adds language names to projects list github styletiagonbotelho2016-03-072-0/+12
| | | | | |
* | | | | | Merge branch 'doc/ci-api-update' into 'master' Achilleas Pipinellis2016-03-086-453/+84
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecated GitLab CI API clean up Deprecated GitLab CI API clean up. The intent here is to clean up deprecated GitLab CI documentation leaving only relevant information. Since we merged `Ci::Project` to `Project` most of this documentation is outdated. Closes #13610 See merge request !3003
| * | | | | | Update format of documentation for CI APIdoc/ci-api-updateGrzegorz Bizon2016-03-012-23/+40
| | | | | | |
| * | | | | | Remove deprecated CI API docs for commits and projectsGrzegorz Bizon2016-02-294-260/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Update CI API documentation for runnersGrzegorz Bizon2016-02-291-53/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Add CI API prefix to documentationGrzegorz Bizon2016-02-291-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Update CI API docs for builds endpoint for runnersGrzegorz Bizon2016-02-292-64/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Deprecated GitLab CI API clean up - READMEGrzegorz Bizon2016-02-291-79/+8
| | | | | | |
* | | | | | | Merge branch 'bundle_clean' into 'master' Achilleas Pipinellis2016-03-082-0/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add bundle clean to upgrade docs This MR adds a bundle clean after installing new gems. Bundle clean removes old, not needed gems to keep the system clean. See merge request !2809
| * | | | | | | make cleanup optionalChristian Mehlmauer2016-03-072-1/+6
| | | | | | | |
| * | | | | | | add bundle clean to upgrade docsChristian Mehlmauer2016-02-142-0/+4
| | | | | | | |
* | | | | | | | Merge branch 'doc-troubleshooting' into 'master' Achilleas Pipinellis2016-03-086-31/+166
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Troubleshooting information for most used services. This replaces the changes started at gitlab-com/www-gitlab-com!1603 I'd like to add similar troubleshooting information for EE only services, but that needs to happen on a different MR on the EE side. Probably after this one gets merged. cc @ernstvn @dblessing @balameb @cabargas @kelvinmutuma See merge request !3080
| * | | | | | | | Fixed headers for anchorsdoc-troubleshootingPatricio Cano2016-03-073-17/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | Added Troubleshooting information for most used services.Patricio Cano2016-03-036-31/+173
| | | | | | | | |
* | | | | | | | | Merge branch 'rs-initial-setup-docs' into 'master' Achilleas Pipinellis2016-03-082-4/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document changes to the initial admin password Addresses https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3068#note_4117550 [ci skip] See merge request !3120
View Lorry Controller Status