summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'docker-registry' into 'master' Douwe Maan2016-05-166-3/+187
|\
| * Fix offline_token http_status codeKamil Trzcinski2016-05-151-1/+1
| * Fix http status codes for container registry authentication serviceKamil Trzcinski2016-05-151-2/+2
| * Improve authentication service specsKamil Trzcinski2016-05-151-3/+3
| * Improve JwtControllerKamil Trzcinski2016-05-141-1/+1
| * Rename JWT to JSONWebTokenKamil Trzcinski2016-05-143-23/+18
| * Fix authentication serviceKamil Trzcinski2016-05-142-1/+8
| * Add TODOKamil Trzcinski2016-05-141-0/+3
| * Improve code design after reviewKamil Trzcinski2016-05-141-5/+2
| * Use Auth::ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-143-72/+70
| * Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-13150-1868/+514
| |\
| * | Improve JwtController codeKamil Trzcinski2016-05-131-18/+19
| * | Move JWT to Gitlab::JWTKamil Trzcinski2016-05-132-51/+53
| * | Fix CI testsKamil Trzcinski2016-05-122-4/+4
| * | Rename DockerAuthenticationService to ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-092-10/+14
| * | Make code more clear in what is doneKamil Trzcinski2016-05-092-13/+14
| * | Rename `images` to `container_registry`Kamil Trzcinski2016-05-095-13/+18
| * | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-09205-826/+1345
| |\ \
| * | | Split docker authentication serviceKamil Trzcinski2016-05-022-101/+78
| * | | Added JWT controllerKamil Trzcinski2016-05-021-0/+173
| * | | Make images_enabled configurableKamil Trzcinski2016-04-292-1/+12
| * | | Added authentication service for docker registryKamil Trzcinski2016-04-293-2/+12
* | | | Merge branch 'gh-pull-requests'Douwe Maan2016-05-163-7/+33
|\ \ \ \
| * | | | Extract GitHub branch formatterDouglas Barbosa Alexandre2016-05-131-0/+4
| * | | | Preserve commits/diff/comments for PRs that were merged on GitHubDouglas Barbosa Alexandre2016-05-132-7/+29
| | |_|/ | |/| |
* | | | Change colors for charcoal and graphite sidebar themesdz-change-sidebar-colorsDmitriy Zaporozhets2016-05-141-4/+4
* | | | 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
* | | | Clean up LegacyDiffNote somewhatDouwe Maan2016-05-134-100/+79
* | | | Use `@diff_notes_disabled` instead of `@comments_allowed`Douwe Maan2016-05-136-7/+7
* | | | Extract LegacyDiffNote out of NoteDouwe Maan2016-05-1327-359/+366
|/ / /
* | | Merge branch 'rubocop/space-around-operators' into 'master' Robert Speicher2016-05-139-10/+10
|\ \ \
| * | | Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-139-10/+10
* | | | Merge branch '17338-sidebar-width' into 'master' Dmitriy Zaporozhets2016-05-132-2/+2
|\ \ \ \
| * | | | Undo changes; reduce sidebar internal width17338-sidebar-widthAnnabel Dunstone2016-05-121-9/+4
| * | | | No extra link padding at xs screen sizeAnnabel Dunstone2016-05-101-2/+4
| * | | | Reduce width of side navAnnabel Dunstone2016-05-102-5/+8
* | | | | Merge branch '17501-dropdown-bug' into 'master' Dmitriy Zaporozhets2016-05-134-2/+29
|\ \ \ \ \
| * | | | | Fix mobile dropdown bugAnnabel Dunstone2016-05-134-2/+29
* | | | | | Fix login btn vertical alignDmitriy Zaporozhets2016-05-131-1/+1
* | | | | | Fix issue sidebar top position after header height changeDmitriy Zaporozhets2016-05-132-3/+3
* | | | | | Remove background color differentiation from gitlab logo/text in sidebardz-improve-sidebar-designDmitriy Zaporozhets2016-05-131-4/+1
|/ / / / /
* | | | | Merge branch '17485-broadcast-msg' into 'master' Dmitriy Zaporozhets2016-05-131-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Move broadcast msg into content-wrapper17485-broadcast-msgAnnabel Dunstone2016-05-121-1/+1
* | | | | Merge branch 'fix_health_check_type' into 'master' Douwe Maan2016-05-121-1/+1
|\ \ \ \ \
| * | | | | Fix minor typos in admin health check pageDrew Blessing2016-05-121-1/+1
* | | | | | Merge branch 'deprecated-class-methods-cop' into 'master' Robert Speicher2016-05-122-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Enable the Rubocop DeprecatedClassMethods copConnor Shea2016-05-082-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'default-scope-on-builds-page' into 'master' Robert Speicher2016-05-122-2/+2
|\ \ \ \ \