summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Fix authentication serviceKamil Trzcinski2016-05-143-1/+9
| | | | | | |
| * | | | | | Add TODOKamil Trzcinski2016-05-141-0/+3
| | | | | | |
| * | | | | | Improve code design after reviewKamil Trzcinski2016-05-141-5/+2
| | | | | | |
| * | | | | | Simplify registry configurationKamil Trzcinski2016-05-142-36/+6
| | | | | | |
| * | | | | | Rename specsKamil Trzcinski2016-05-141-1/+1
| | | | | | |
| * | | | | | Use Auth::ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-144-73/+71
| | | | | | |
| * | | | | | Fix specsKamil Trzcinski2016-05-141-1/+1
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-13321-3646/+3010
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/initializers/1_settings.rb
| * | | | | | | Improve JWT::RSAToken::kidKamil Trzcinski2016-05-131-4/+6
| | | | | | | |
| * | | | | | | Improve JwtController codeKamil Trzcinski2016-05-131-18/+19
| | | | | | | |
| * | | | | | | Move JWT to Gitlab::JWTKamil Trzcinski2016-05-132-51/+53
| | | | | | | |
| * | | | | | | Fix CI testsKamil Trzcinski2016-05-128-38/+38
| | | | | | | |
| * | | | | | | Added rspec for testing container registry authentication serviceKamil Trzcinski2016-05-093-0/+241
| | | | | | | |
| * | | | | | | Rename DockerAuthenticationService to ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-093-18/+20
| | | | | | | |
| * | | | | | | Make code more clear in what is doneKamil Trzcinski2016-05-092-13/+14
| | | | | | | |
| * | | | | | | Update docs/api/projects.md with container registry enabled optionKamil Trzcinski2016-05-091-0/+3
| | | | | | | |
| * | | | | | | Added CHANGELOG entryKamil Trzcinski2016-05-091-0/+1
| | | | | | | |
| * | | | | | | Remove unused partsKamil Trzcinski2016-05-094-190/+0
| | | | | | | |
| * | | | | | | Rename `images` to `container_registry`Kamil Trzcinski2016-05-0912-27/+35
| | | | | | | |
| * | | | | | | Revert "Eager load `lib/api`"Kamil Trzcinski2016-05-095-141/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0a280158efeb7f681589ae7af24f0ed9052de809.
| * | | | | | | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-09321-1356/+3895
| |\ \ \ \ \ \ \
| * | | | | | | | Split docker authentication serviceKamil Trzcinski2016-05-024-101/+162
| | | | | | | | |
| * | | | | | | | Added JWT controllerKamil Trzcinski2016-05-024-0/+179
| | | | | | | | |
| * | | | | | | | Eager load `lib/api`Timothy Andrew2016-04-295-140/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-293-1/+13
| | | | | | | | |
| * | | | | | | | Try to fix auth serviceKamil Trzcinski2016-04-291-17/+17
| | | | | | | | |
| * | | | | | | | Make images_enabled configurableKamil Trzcinski2016-04-294-2/+19
| | | | | | | | |
| * | | | | | | | Added authentication service for docker registryKamil Trzcinski2016-04-2910-2/+226
| | | | | | | | |
* | | | | | | | | Merge branch 'gh-pull-requests'Douwe Maan2016-05-1610-96/+231
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-05-131-0/+1
| | | | | | | | |
| * | | | | | | | 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-134-5/+22
| | | | | | | | |
| * | | | | | | | Extract GitHub branch formatterDouglas Barbosa Alexandre2016-05-136-165/+113
| | | | | | | | |
| * | | | | | | | Import PRs where branch names were reused across PRsDouglas Barbosa Alexandre2016-05-132-10/+50
| | | | | | | | |
| * | | | | | | | Preserve commits/diff/comments for PRs that were merged on GitHubDouglas Barbosa Alexandre2016-05-135-9/+50
| | | | | | | | |
| * | | | | | | | Fix spec for Gitlab::GithubImport::PullRequestFormatterDouglas Barbosa Alexandre2016-05-133-28/+76
| | | | | | | | |
| * | | | | | | | 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
| | | | | | | | |
* | | | | | | | | Merge branch 'add-cache-count-metrics' into 'master' Yorick Peterse2016-05-163-10/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cache count metrics to rails cache See merge request !4157
| * | | | | | | | | Add cache count metrics to rails cacheadd-cache-count-metricsPablo Carranza2016-05-153-10/+19
|/ / / / / / / / /
* | | | | | | | | Merge branch 'dz-change-sidebar-colors' into 'master' Dmitriy Zaporozhets2016-05-141-4/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change colors for charcoal and graphite sidebar themes Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler @jschatz1 See merge request !4149
| * | | | | | | | Change colors for charcoal and graphite sidebar themesdz-change-sidebar-colorsDmitriy Zaporozhets2016-05-141-4/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'refactor-diff-notes' into 'master' Douwe Maan2016-05-1338-454/+449
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor diff notes Related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4101 /cc @rspeicher See merge request !4110
| * | | | | | | Rename diff_with_notes partial.Douwe Maan2016-05-132-1/+1
| | | | | | | |
| * | | | | | | Satisfy RubocopDouwe Maan2016-05-131-1/+1
| | | | | | | |
| * | | | | | | "the outdated diff" -> "an outdated diff"Douwe Maan2016-05-131-1/+1
| | | | | | | |
| * | | | | | | Update specsDouwe Maan2016-05-134-84/+10
| | | | | | | |
| * | | | | | | Clean up LegacyDiffNote somewhatDouwe Maan2016-05-136-101/+154
| | | | | | | |