summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'issue_17302' into 'master' Rémy Coutable2016-05-181-18/+29
|\ | | | | | | | | | | | | Fix api leaking notes when user is not authorized to read noteable fixes #17302 See merge request !4102
| * Move note helper method to notes entity fileissue_17302Felipe Artur2016-05-172-6/+8
| |
| * Fix single note api requestFelipe Artur2016-05-162-5/+9
| |
| * Fix notes API calls symbol convertionsFelipe Artur2016-05-101-3/+3
| |
| * Fix api leaking notes when user is not authorized to read noteableFelipe Artur2016-05-091-13/+18
| |
* | fix typo from bad refactoringJames Lopez2016-05-171-1/+1
| |
* | Merge branch 'wiki-fix-reloaded' into 'master' Rémy Coutable2016-05-161-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the relative url prefix for links in Wiki Retry of gitlab-org/gitlab-ce!4026 @rymai !4050 solved all other problems how it looks like. I [tested](https://gitlab.com/artem-forks/gitlab-ce/commit/ff01eca7b559efa7cacf3412aa01cd8ae8a6db7e/builds) this with ruby22 Fixes #17071 See merge request !4131
| * | Use the relative url prefix for links in WikiArtem Sidorenko2016-05-131-1/+1
| | |
* | | Merge branch 'docker-registry' into 'master' Douwe Maan2016-05-164-1/+95
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added authentication service for docker registry This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes. I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry? What do you think @jacobvosmaer @sytses @marin? cc @marin See merge request !3787
| * | | Rename JWT to JSONWebTokenKamil Trzcinski2016-05-142-2/+2
| | | |
| * | | Simplify JWT::RSAToken::kidKamil Trzcinski2016-05-141-4/+8
| | | |
| * | | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-1328-344/+362
| |\ \ \ | | |/ / | | | | | | | | | | | | # Conflicts: # config/initializers/1_settings.rb
| * | | Improve JWT::RSAToken::kidKamil Trzcinski2016-05-131-4/+6
| | | |
| * | | Fix CI testsKamil Trzcinski2016-05-122-3/+3
| | | |
| * | | Rename DockerAuthenticationService to ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-091-8/+6
| | | |
| * | | Remove unused partsKamil Trzcinski2016-05-092-188/+0
| | | |
| * | | Rename `images` to `container_registry`Kamil Trzcinski2016-05-092-6/+6
| | | |
| * | | Revert "Eager load `lib/api`"Kamil Trzcinski2016-05-093-139/+139
| | | | | | | | | | | | | | | | This reverts commit 0a280158efeb7f681589ae7af24f0ed9052de809.
| * | | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-0913-34/+255
| |\ \ \
| * | | | Split docker authentication serviceKamil Trzcinski2016-05-022-0/+84
| | | | |
| * | | | Eager load `lib/api`Timothy Andrew2016-04-293-139/+139
| | | | | | | | | | | | | | | | | | | | - So that the server doesn't have to be restarted for every change in dev.
| * | | | Missing parameters of docker payloadKamil Trzcinski2016-04-291-2/+21
| | | | |
| * | | | AudienceKamil Trzcinski2016-04-291-0/+1
| | | | |
| * | | | Auth tokenKamil Trzcinski2016-04-291-1/+2
| | | | |
| * | | | Try to fix auth serviceKamil Trzcinski2016-04-291-17/+17
| | | | |
| * | | | Make images_enabled configurableKamil Trzcinski2016-04-292-1/+7
| | | | |
| * | | | Added authentication service for docker registryKamil Trzcinski2016-04-292-0/+167
| | | | |
* | | | | Merge branch 'gh-pull-requests'Douwe Maan2016-05-163-57/+97
|\ \ \ \ \
| * | | | | Remove branches that does exist on GitHub after PRs were importedDouglas Barbosa Alexandre2016-05-131-2/+3
| | | | | |
| * | | | | Fix validation method for Gitlab::GithubImport::PullRequestFormatterDouglas Barbosa Alexandre2016-05-132-3/+6
| | | | | |
| * | | | | Extract GitHub branch formatterDouglas Barbosa Alexandre2016-05-133-77/+52
| | | | | |
| * | | | | Import PRs where branch names were reused across PRsDouglas Barbosa Alexandre2016-05-131-4/+24
| | | | | |
| * | | | | Preserve commits/diff/comments for PRs that were merged on GitHubDouglas Barbosa Alexandre2016-05-131-0/+2
| | | | | |
| * | | | | Fix spec for Gitlab::GithubImport::PullRequestFormatterDouglas Barbosa Alexandre2016-05-132-6/+6
| | | | | |
| * | | | | Import pull requests from GitHub where the target branch was removedDouglas Barbosa Alexandre2016-05-132-12/+31
| | | | | |
| * | | | | Import pull requests from GitHub where the source branch was removedDouglas Barbosa Alexandre2016-05-132-27/+47
| | |_|/ / | |/| | |
* | | | | Add cache count metrics to rails cacheadd-cache-count-metricsPablo Carranza2016-05-151-5/+7
| | | | |
* | | | | Clean up LegacyDiffNote somewhatDouwe Maan2016-05-131-1/+1
| | | | |
* | | | | Extract LegacyDiffNote out of NoteDouwe Maan2016-05-132-3/+5
|/ / / /
* | | | Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-133-5/+5
| | | |
* | | | Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher2016-05-122-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the Rubocop DeprecatedClassMethods cop This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods. See merge request !4087
| * | | | Enable the Rubocop DeprecatedClassMethods copConnor Shea2016-05-082-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | This reports uses of `File.exists?` and `Dir.exists?`, which were both deprecated in Ruby and will eventually be removed in favor of `.exist?`. Also fixes all existing uses of the deprecated methods.
* | | | Add API endpoints for un/subscribing from/to a labelAhmad Sherif2016-05-127-77/+80
| | | | | | | | | | | | | | | | Closes #15638
* | | | Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz2016-05-121-21/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update build log incrementally Proof of concept implementation of incremental sending of build log to browser. cc @jschatz1 @vsizov @grzesiek @tmaczukin See merge request !3737
| * \ \ \ Merge remote-tracking branch 'origin/master' into send-incremental-build-logKamil Trzcinski2016-05-107-50/+22
| |\ \ \ \
| * | | | | Encode state as base64 stringKamil Trzcinski2016-05-091-4/+9
| | | | | |
| * | | | | Send trace to a browser incrementally when build is runningKamil Trzcinski2016-05-091-21/+57
| | |/ / / | |/| | | | | | | | | | | | | | | | | | We send a state of ansi2html to client, client needs to send this state back. The state describes the configuration of generator and position within trace.
* | | | | Removed tracking of total method execution timestotal-method-timeYorick Peterse2016-05-121-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because method call timings are inclusive (that is, they include the time of any sub method calls) this would lead to the total method execution time often being far greater than the total transaction time. Because this is incredibly confusing it's best to simply _not_ track the total method execution time, after all it's not that useful to begin with. Fixes gitlab-org/gitlab-ce#17239
* | | | | Add a spec for `WikiLinkFilter`Timothy Andrew2016-05-121-3/+8
| | | | | | | | | | | | | | | | | | | | - And fix behavior for non-file hierarchical links.
* | | | | Merge branch '17249-starred' into 'master' Robert Speicher2016-05-111-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict starred projects to viewable ones `User#starred_projects` doesn't perform any visibility checks. This has a couple of problems: 1. It assumes a user can always view all of their starred projects in perpetuity (project not changed to private, access revoked, etc.). 2. It assumes that we'll only ever allow a user to star a project they can view. This is currently the case, but bugs happen. Add `User#viewable_starred_projects` to filter the starred projects by those the user either has explicit access to, or are public or internal. Then use that in all places where we list the user's starred projects. Closes #17249. See merge request !4108
View Lorry Controller Status