Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'docker-registry' into 'master' | Douwe Maan | 2016-05-16 | 6 | -3/+187 |
|\ | |||||
| * | Fix offline_token http_status code | Kamil Trzcinski | 2016-05-15 | 1 | -1/+1 |
| * | Fix http status codes for container registry authentication service | Kamil Trzcinski | 2016-05-15 | 1 | -2/+2 |
| * | Improve authentication service specs | Kamil Trzcinski | 2016-05-15 | 1 | -3/+3 |
| * | Improve JwtController | Kamil Trzcinski | 2016-05-14 | 1 | -1/+1 |
| * | Rename JWT to JSONWebToken | Kamil Trzcinski | 2016-05-14 | 3 | -23/+18 |
| * | Fix authentication service | Kamil Trzcinski | 2016-05-14 | 2 | -1/+8 |
| * | Add TODO | Kamil Trzcinski | 2016-05-14 | 1 | -0/+3 |
| * | Improve code design after review | Kamil Trzcinski | 2016-05-14 | 1 | -5/+2 |
| * | Use Auth::ContainerRegistryAuthenticationService | Kamil Trzcinski | 2016-05-14 | 3 | -72/+70 |
| * | Merge remote-tracking branch 'origin/master' into docker-registry | Kamil Trzcinski | 2016-05-13 | 150 | -1868/+514 |
| |\ | |||||
| * | | 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 | 2 | -4/+4 |
| * | | Rename DockerAuthenticationService to ContainerRegistryAuthenticationService | Kamil Trzcinski | 2016-05-09 | 2 | -10/+14 |
| * | | Make code more clear in what is done | Kamil Trzcinski | 2016-05-09 | 2 | -13/+14 |
| * | | Rename `images` to `container_registry` | Kamil Trzcinski | 2016-05-09 | 5 | -13/+18 |
| * | | Merge remote-tracking branch 'origin/master' into docker-registry | Kamil Trzcinski | 2016-05-09 | 205 | -826/+1345 |
| |\ \ | |||||
| * | | | Split docker authentication service | Kamil Trzcinski | 2016-05-02 | 2 | -101/+78 |
| * | | | Added JWT controller | Kamil Trzcinski | 2016-05-02 | 1 | -0/+173 |
| * | | | Make images_enabled configurable | Kamil Trzcinski | 2016-04-29 | 2 | -1/+12 |
| * | | | Added authentication service for docker registry | Kamil Trzcinski | 2016-04-29 | 3 | -2/+12 |
* | | | | Merge branch 'gh-pull-requests' | Douwe Maan | 2016-05-16 | 3 | -7/+33 |
|\ \ \ \ | |||||
| * | | | | Extract GitHub branch formatter | Douglas Barbosa Alexandre | 2016-05-13 | 1 | -0/+4 |
| * | | | | Preserve commits/diff/comments for PRs that were merged on GitHub | Douglas Barbosa Alexandre | 2016-05-13 | 2 | -7/+29 |
| | |_|/ | |/| | | |||||
* | | | | Change colors for charcoal and graphite sidebar themesdz-change-sidebar-colors | Dmitriy Zaporozhets | 2016-05-14 | 1 | -4/+4 |
* | | | | 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 |
* | | | | Clean up LegacyDiffNote somewhat | Douwe Maan | 2016-05-13 | 4 | -100/+79 |
* | | | | Use `@diff_notes_disabled` instead of `@comments_allowed` | Douwe Maan | 2016-05-13 | 6 | -7/+7 |
* | | | | Extract LegacyDiffNote out of Note | Douwe Maan | 2016-05-13 | 27 | -359/+366 |
|/ / / | |||||
* | | | Merge branch 'rubocop/space-around-operators' into 'master' | Robert Speicher | 2016-05-13 | 9 | -10/+10 |
|\ \ \ | |||||
| * | | | Codestyle: make sure we have space around operators | Gabriel Mazetto | 2016-05-13 | 9 | -10/+10 |
* | | | | Merge branch '17338-sidebar-width' into 'master' | Dmitriy Zaporozhets | 2016-05-13 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Undo changes; reduce sidebar internal width17338-sidebar-width | Annabel Dunstone | 2016-05-12 | 1 | -9/+4 |
| * | | | | No extra link padding at xs screen size | Annabel Dunstone | 2016-05-10 | 1 | -2/+4 |
| * | | | | Reduce width of side nav | Annabel Dunstone | 2016-05-10 | 2 | -5/+8 |
* | | | | | Merge branch '17501-dropdown-bug' into 'master' | Dmitriy Zaporozhets | 2016-05-13 | 4 | -2/+29 |
|\ \ \ \ \ | |||||
| * | | | | | Fix mobile dropdown bug | Annabel Dunstone | 2016-05-13 | 4 | -2/+29 |
* | | | | | | Fix login btn vertical align | Dmitriy Zaporozhets | 2016-05-13 | 1 | -1/+1 |
* | | | | | | Fix issue sidebar top position after header height change | Dmitriy Zaporozhets | 2016-05-13 | 2 | -3/+3 |
* | | | | | | Remove background color differentiation from gitlab logo/text in sidebardz-improve-sidebar-design | Dmitriy Zaporozhets | 2016-05-13 | 1 | -4/+1 |
|/ / / / / | |||||
* | | | | | Merge branch '17485-broadcast-msg' into 'master' | Dmitriy Zaporozhets | 2016-05-13 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Move broadcast msg into content-wrapper17485-broadcast-msg | Annabel Dunstone | 2016-05-12 | 1 | -1/+1 |
* | | | | | Merge branch 'fix_health_check_type' into 'master' | Douwe Maan | 2016-05-12 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fix minor typos in admin health check page | Drew Blessing | 2016-05-12 | 1 | -1/+1 |
* | | | | | | Merge branch 'deprecated-class-methods-cop' into 'master' | Robert Speicher | 2016-05-12 | 2 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Enable the Rubocop DeprecatedClassMethods cop | Connor Shea | 2016-05-08 | 2 | -2/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'default-scope-on-builds-page' into 'master' | Robert Speicher | 2016-05-12 | 2 | -2/+2 |
|\ \ \ \ \ |