summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* add linting script for documentationwinniehell2016-08-092-0/+22
|
* Merge branch '20129-update-version_sorter-gem-to-optimize-tag-sorting' into ↵Yorick Peterse2016-08-084-6/+5
|\ | | | | | | | | | | | | | | 'master' Update version_sorter and use new interface for faster tag sorting See merge request !5723
| * Update version_sorter and use new interface for faster tag sortingAlejandro Rodríguez2016-08-084-6/+5
| |
* | Merge branch 'zj-enable-deploy-keys-api' into 'master' Douwe Maan2016-08-089-163/+326
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable/Disable Deploy keys for a project Closes #20123 ## Does this MR meet the acceptance criteria? - [X] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [X] API support added - Tests - [X] Added for this feature/bug - [X] All builds are passing See merge request !5647
| * | Namespace EnableDeployKeyService under ProjectsZ.J. van de Weg2016-08-085-18/+22
| | |
| * | Fix styling on docs of Deploy Keys endpointszj-enable-deploy-keys-apiZ.J. van de Weg2016-08-051-3/+2
| | |
| * | Create service for enabling deploy keysZ.J. van de Weg2016-08-055-22/+58
| | |
| * | Move deploy_key tests to deploy_key_spec.rbZ.J. van de Weg2016-08-043-78/+81
| | | | | | | | | | | | Also, fix the failing test in the process
| * | Use Grape DSL for deploy keys endpointsZ.J. van de Weg2016-08-032-40/+34
| | | | | | | | | | | | Also a minor clean up of the post endpoint
| * | Endpoints to enable and disable deploy keysZ.J. van de Weg2016-08-035-38/+165
| | | | | | | | | | | | Resolves #20123
* | | Merge branch 'git-http-push-check' into 'master' Robert Speicher2016-08-084-29/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop 'git push' over HTTP early Before this change we always let users push Git data over HTTP before deciding whether to accept to push. This was different from pushing over SSH where we terminate a 'git push' early if we already know the user is not allowed to push. This change let Git over HTTP follow the same behavior as Git over SSH. We also distinguish between HTTP 404 and 403 responses when denying Git requests, depending on whether the user is allowed to know the project exists. See merge request !5639
| * | | Fix ArgumentError in GitAccess specsJacob Vosmaer2016-08-041-6/+6
| | | |
| * | | Stop 'git push' over HTTP earlyJacob Vosmaer2016-08-033-23/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change we always let users push Git data over HTTP before deciding whether to accept to push. This was different from pushing over SSH where we terminate a 'git push' early if we already know the user is not allowed to push. This change let Git over HTTP follow the same behavior as Git over SSH. We also distinguish between HTTP 404 and 403 responses when denying Git requests, depending on whether the user is allowed to know the project exists.
* | | | Merge branch 'patch-3' into 'master' Achilleas Pipinellis2016-08-082-1/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "This file is managed by gitlab-ctl. Manual changes will be erased!" ## What does this MR do? This merge request replaces the word "gitlab.yml" with the word "gitlab.rb" in one section of the admin area. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Configuration is no longer done in gitlab.yml, which is overwritten by gitlab-ctl. ## What are the relevant issue numbers? None. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [X] Branch has no merge conflicts with `master` (if you do - rebase it please) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5600
| * | | "This file is managed by gitlab-ctl. Manual changes will be erased!"Jeffrey Lin2016-08-082-1/+4
| | | |
* | | | Merge branch 'rubocop/EmptyLinesAroundModuleBody' into 'master' Douwe Maan2016-08-084-8/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/EmptyLinesAround Module/Class Body cop ## What does this MR do? Enable a new rubocop cops as discussed here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1877/diffs#note_13021078 ## Are there points in the code the reviewer needs to double check? May be a good idea to send a message to people to prevent `master` red because of the new cop. ## Why was this MR needed? We want to improve code style and not waste endbosses time checking style manually ## What are the relevant issue numbers? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5692
| * | | | Enable Style/EmptyLinesAroundClassBody coprubocop/EmptyLinesAroundModuleBodyGabriel Mazetto2016-08-063-3/+1
| | | | |
| * | | | Enable Style/EmptyLinesAroundModuleBody copGabriel Mazetto2016-08-063-5/+1
| | | | |
* | | | | Merge branch 'revert-host-header-overwrite' into 'master' Douwe Maan2016-08-082-12/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Defend against 'Host' header injection" We reverted this in omnibus but forgot to do it in the source NGINX template. See merge request !5706
| * | | | | Revert "Defend against 'Host' header injection"Jacob Vosmaer2016-08-082-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 47b5b441395921e9f8e9982bb3f560e5db5a67bc. See https://gitlab.com/gitlab-org/gitlab-ce/issues/17877#note_13488047
* | | | | | Merge branch 'rubocop/SpaceAroundEqualsInParameterDefault' into 'master' Douwe Maan2016-08-0813-21/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/SpaceAroundEqualsInParameterDefault cop ## What does this MR do? Enable a new rubocop cops as discussed here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1877#note_13529646 ## Are there points in the code the reviewer needs to double check? May be a good idea to send a message to people to prevent master red because of the new cop. ## Why was this MR needed? We want to improve code style and not waste endbosses time checking style manually ## What are the relevant issue numbers? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5693
| * | | | | | Enable Style/SpaceAroundEqualsInParameterDefault coprubocop/SpaceAroundEqualsInParameterDefaultGabriel Mazetto2016-08-0613-21/+18
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'decode-log-postreceive-args' into 'master' Douwe Maan2016-08-082-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Log base64-decoded PostReceive arguments The change to base64-encoding the third argument to PostReceive in gitlab-shell made our Sidekiq ArgumentsLogger a little less useful. This change adds decoded data to the log statement. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20381 See merge request !5547
| * | | | | | Log base64-decoded PostReceive argumentsJacob Vosmaer2016-08-052-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change to base64-encoding the third argument to PostReceive in gitlab-shell made our Sidekiq ArgumentsLogger a little less useful. This change adds a log statement for the decoded data. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20381
* | | | | | | Merge branch 'fix/import-pending-user' into 'master' Rémy Coutable2016-08-083-5/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support pending invitation project members importing projects Adds support for pending invitation project members on Import/Export - previously the import would fail. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19973 - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5683
| * | | | | | | Support pending invitation project members importing projectsJames Lopez2016-08-083-5/+29
| | | | | | | |
* | | | | | | | Merge branch 'faster-cache-keys' into 'master' Rémy Coutable2016-08-085-0/+36
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize "cache_key" using a concern ## What does this MR do? This MR adds a concern (used by Issue and Note) that provides an optimized version of Rails' `cache_key` method. See 77c8520e2ecd70520757aed0fbdf434643b60234 for more details. ## Are there points in the code the reviewer needs to double check? No, though a spell check would be appreciated. ## Why was this MR needed? When loading a lot of data from Redis (e.g. an issue with lots of notes) quite a large amount of time is spent in generating cache keys. This is due to multiple reasons such as: * Rails trying to figure out if it should use `updated_at` or `updated_on` using somewhat inefficient code * Rails relying on pluralization logic to figure out how to generate a cache namespace using a model name * Rails calling a whole bunch of methods in general in the process of generating cache keys In short, Rails is trying to cater to every possible use case, at the cost of performance. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/13651 is not directly related but I ran into this `cache_key` problem when looking into said issue. See merge request !5715
| * | | | | | | | Added concern for a faster "cache_key" methodfaster-cache-keysYorick Peterse2016-08-085-0/+36
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This concern provides an optimized/simplified version of the "cache_key" method. This method is about 9 times faster than the default "cache_key" method. The produced cache keys _are_ different from the previous ones but this is worth the performance improvement. To showcase this I set up a benchmark (using benchmark-ips) that compares FasterCacheKeys#cache_key with the regular cache_key. The output of this benchmark was: Calculating ------------------------------------- cache_key 4.825k i/100ms cache_key_fast 21.723k i/100ms ------------------------------------------------- cache_key 59.422k (± 7.2%) i/s - 299.150k cache_key_fast 543.243k (± 9.2%) i/s - 2.694M Comparison: cache_key_fast: 543243.4 i/s cache_key: 59422.0 i/s - 9.14x slower To see the impact on real code I applied these changes and benchmarked Issue#referenced_merge_requests. For an issue referencing 10 merge requests these changes shaved off between 40 and 60 milliseconds.
* | | | | | | | Merge branch 'update-templates' into 'master' Rémy Coutable2016-08-083-19/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update templates There was a copy pasta in the templates, therefor another MR with updates. See merge request !5714
| * | | | | | | | Update templatesZ.J. van de Weg2016-08-083-19/+19
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-08-08100-636/+1275
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'branch-permissions' into 'master' Jacob Schatz2016-08-0818-229/+350
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Branch permissions layout CE part of https://gitlab.com/gitlab-org/gitlab-ee/issues/179 Related javascript code has been refactored and also layout has been updated. ![Screen_Shot_2016-08-04_at_3.23.19_PM](/uploads/a0f6165e255b3f93dcb80eaa3f3318e4/Screen_Shot_2016-08-04_at_3.23.19_PM.png) See merge request !5652
| | * | | | | | | | Ensure we are looking for the right dropdown inside the form wrapperbranch-permissionsAlfredo Sumaran2016-08-051-2/+2
| | | | | | | | | |
| | * | | | | | | | Set for for labels and ID for dropdowns on create formAlfredo Sumaran2016-08-052-5/+6
| | | | | | | | | |
| | * | | | | | | | Fix .panel-title styleAlfredo Sumaran2016-08-053-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since .panel-heading is a bit different from bootstrap, using .panel-title for h3 looks different. So with this .panel-title will look good again inheriting custom properties our app sets for .panel-heading
| | * | | | | | | | Refine selector for form submit buttonAlfredo Sumaran2016-08-051-1/+1
| | | | | | | | | |
| | * | | | | | | | Fix spelling. `braches` to `branches`Alfredo Sumaran2016-08-051-1/+1
| | | | | | | | | |
| | * | | | | | | | Cache onSelect callback before passing to each dropdown instanceAlfredo Sumaran2016-08-051-7/+9
| | | | | | | | | |
| | * | | | | | | | Wrap param with parens for consistencyAlfredo Sumaran2016-08-051-1/+1
| | | | | | | | | |
| | * | | | | | | | Prevent setting HTML directly from the JSAlfredo Sumaran2016-08-052-3/+4
| | | | | | | | | |
| | * | | | | | | | camelCase param nameAlfredo Sumaran2016-08-051-4/+4
| | | | | | | | | |
| | * | | | | | | | Wrap classes with IIFE and define it inside gl namespaceAlfredo Sumaran2016-08-055-121/+141
| | | | | | | | | |
| | * | | | | | | | Add url to Wildcard protected branches documentationAlfredo Sumaran2016-08-051-1/+2
| | | | | | | | | |
| | * | | | | | | | Create protected branch dropdown directlyAlfredo Sumaran2016-08-052-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since there’s only one dropdown of this type we don’t need a class to create this dropdown masively.
| | * | | | | | | | Move classes into its own fileAlfredo Sumaran2016-08-052-13/+12
| | | | | | | | | |
| | * | | | | | | | No need to pass event as a parameterAlfredo Sumaran2016-08-053-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should stop passing events as a parameter since we cannot call the method programatically without faking or creating an event even when that event is not entirely required.
| | * | | | | | | | Add custom css class to each dropdown to fix failing specAlfredo Sumaran2016-08-052-5/+5
| | | | | | | | | |
| | * | | | | | | | Select first value by defaultAlfredo Sumaran2016-08-051-2/+11
| | | | | | | | | |
| | * | | | | | | | Remove unnecesary classes to generate dropdownsAlfredo Sumaran2016-08-053-30/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since there are only one dropdown of each type there are no need to create a class to initialize multiple elements with the same CSS class name.
| | * | | | | | | | Fix class names and move each class to its own fileAlfredo Sumaran2016-08-0510-74/+79
| | | | | | | | | |