Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Fix authentication service | Kamil Trzcinski | 2016-05-14 | 3 | -1/+9 | |
| | | | | | | | ||||||
| * | | | | | | Add TODO | Kamil Trzcinski | 2016-05-14 | 1 | -0/+3 | |
| | | | | | | | ||||||
| * | | | | | | Improve code design after review | Kamil Trzcinski | 2016-05-14 | 1 | -5/+2 | |
| | | | | | | | ||||||
| * | | | | | | Simplify registry configuration | Kamil Trzcinski | 2016-05-14 | 2 | -36/+6 | |
| | | | | | | | ||||||
| * | | | | | | Rename specs | Kamil Trzcinski | 2016-05-14 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Use Auth::ContainerRegistryAuthenticationService | Kamil Trzcinski | 2016-05-14 | 4 | -73/+71 | |
| | | | | | | | ||||||
| * | | | | | | Fix specs | Kamil Trzcinski | 2016-05-14 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge remote-tracking branch 'origin/master' into docker-registry | Kamil Trzcinski | 2016-05-13 | 321 | -3646/+3010 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # config/initializers/1_settings.rb | |||||
| * | | | | | | | Improve JWT::RSAToken::kid | Kamil Trzcinski | 2016-05-13 | 1 | -4/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | Improve JwtController code | Kamil Trzcinski | 2016-05-13 | 1 | -18/+19 | |
| | | | | | | | | ||||||
| * | | | | | | | Move JWT to Gitlab::JWT | Kamil Trzcinski | 2016-05-13 | 2 | -51/+53 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix CI tests | Kamil Trzcinski | 2016-05-12 | 8 | -38/+38 | |
| | | | | | | | | ||||||
| * | | | | | | | Added rspec for testing container registry authentication service | Kamil Trzcinski | 2016-05-09 | 3 | -0/+241 | |
| | | | | | | | | ||||||
| * | | | | | | | Rename DockerAuthenticationService to ContainerRegistryAuthenticationService | Kamil Trzcinski | 2016-05-09 | 3 | -18/+20 | |
| | | | | | | | | ||||||
| * | | | | | | | Make code more clear in what is done | Kamil Trzcinski | 2016-05-09 | 2 | -13/+14 | |
| | | | | | | | | ||||||
| * | | | | | | | Update docs/api/projects.md with container registry enabled option | Kamil Trzcinski | 2016-05-09 | 1 | -0/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | Added CHANGELOG entry | Kamil Trzcinski | 2016-05-09 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Remove unused parts | Kamil Trzcinski | 2016-05-09 | 4 | -190/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Rename `images` to `container_registry` | Kamil Trzcinski | 2016-05-09 | 12 | -27/+35 | |
| | | | | | | | | ||||||
| * | | | | | | | Revert "Eager load `lib/api`" | Kamil Trzcinski | 2016-05-09 | 5 | -141/+140 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0a280158efeb7f681589ae7af24f0ed9052de809. | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into docker-registry | Kamil Trzcinski | 2016-05-09 | 321 | -1356/+3895 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Split docker authentication service | Kamil Trzcinski | 2016-05-02 | 4 | -101/+162 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Added JWT controller | Kamil Trzcinski | 2016-05-02 | 4 | -0/+179 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Eager load `lib/api` | Timothy Andrew | 2016-04-29 | 5 | -140/+141 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - So that the server doesn't have to be restarted for every change in dev. | |||||
| * | | | | | | | | Missing parameters of docker payload | Kamil Trzcinski | 2016-04-29 | 1 | -2/+21 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Audience | Kamil Trzcinski | 2016-04-29 | 1 | -0/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Auth token | Kamil Trzcinski | 2016-04-29 | 3 | -1/+13 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Try to fix auth service | Kamil Trzcinski | 2016-04-29 | 1 | -17/+17 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Make images_enabled configurable | Kamil Trzcinski | 2016-04-29 | 4 | -2/+19 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Added authentication service for docker registry | Kamil Trzcinski | 2016-04-29 | 10 | -2/+226 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'gh-pull-requests' | Douwe Maan | 2016-05-16 | 10 | -96/+231 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-05-13 | 1 | -0/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Remove branches that does exist on GitHub after PRs were imported | Douglas Barbosa Alexandre | 2016-05-13 | 1 | -2/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fix validation method for Gitlab::GithubImport::PullRequestFormatter | Douglas Barbosa Alexandre | 2016-05-13 | 4 | -5/+22 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Extract GitHub branch formatter | Douglas Barbosa Alexandre | 2016-05-13 | 6 | -165/+113 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Import PRs where branch names were reused across PRs | Douglas Barbosa Alexandre | 2016-05-13 | 2 | -10/+50 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Preserve commits/diff/comments for PRs that were merged on GitHub | Douglas Barbosa Alexandre | 2016-05-13 | 5 | -9/+50 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fix spec for Gitlab::GithubImport::PullRequestFormatter | Douglas Barbosa Alexandre | 2016-05-13 | 3 | -28/+76 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Import pull requests from GitHub where the target branch was removed | Douglas Barbosa Alexandre | 2016-05-13 | 2 | -12/+31 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Import pull requests from GitHub where the source branch was removed | Douglas Barbosa Alexandre | 2016-05-13 | 2 | -27/+47 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'add-cache-count-metrics' into 'master' | Yorick Peterse | 2016-05-16 | 3 | -10/+19 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cache count metrics to rails cache See merge request !4157 | |||||
| * | | | | | | | | | Add cache count metrics to rails cacheadd-cache-count-metrics | Pablo Carranza | 2016-05-15 | 3 | -10/+19 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch 'dz-change-sidebar-colors' into 'master' | Dmitriy Zaporozhets | 2016-05-14 | 1 | -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-colors | Dmitriy Zaporozhets | 2016-05-14 | 1 | -4/+4 | |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
* | | | | | | | | Merge branch 'refactor-diff-notes' into 'master' | Douwe Maan | 2016-05-13 | 38 | -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 Maan | 2016-05-13 | 2 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Satisfy Rubocop | Douwe Maan | 2016-05-13 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | "the outdated diff" -> "an outdated diff" | Douwe Maan | 2016-05-13 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Update specs | Douwe Maan | 2016-05-13 | 4 | -84/+10 | |
| | | | | | | | | ||||||
| * | | | | | | | Clean up LegacyDiffNote somewhat | Douwe Maan | 2016-05-13 | 6 | -101/+154 | |
| | | | | | | | |