summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-13321-3646/+3010
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-136-79/+95
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/jwt_controller.rb # app/services/jwt/container_registry_authentication_service.rb
| * | | | | | | | | | | | | | | | | | | Fix container registry permissionsKamil Trzcinski2016-05-134-2/+21
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix specsKamil Trzcinski2016-05-131-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix CI testsKamil Trzcinski2016-05-1213-20/+31
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-127-37/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Added Docker Registry View testsKamil Trzcinski2016-05-0910-27/+87
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Block renaming project or repository if it has container registry tagsKamil Trzcinski2016-05-093-0/+24
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix review commentsKamil Trzcinski2016-05-093-15/+20
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Rename image to container_registryKamil Trzcinski2016-05-093-7/+7
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Simplify Container Registry view implementationKamil Trzcinski2016-05-096-25/+41
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Rename ImageRegistry to ContainerRegistryKamil Trzcinski2016-05-098-22/+21
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-09340-1741/+4345
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | WIPKamil Trzcinski2016-05-0810-40/+43
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Use Container ImagesKamil Trzcinski2016-05-042-4/+7
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Use Container Images instead of ImagesKamil Trzcinski2016-05-042-10/+22
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Use bearer token to access registryKamil Trzcinski2016-05-042-1/+13
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fix bearer token supportKamil Trzcinski2016-05-042-2/+2
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Allow to copy all manifests from one container repository to anotherKamil Trzcinski2016-05-044-5/+38
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Remove container registry on project removalKamil Trzcinski2016-05-042-1/+10
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Remove unused mime_typesKamil Trzcinski2016-05-041-7/+0
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Implement Container Registry API clientKamil Trzcinski2016-05-0411-106/+263
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Added docker registry viewKamil Trzcinski2016-05-0412-0/+187
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-1827-72/+160
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '15640-confidential-issue' into 'master' Rémy Coutable2016-05-183-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix atom feeds and links 1. The atom feed for a group's issues didn't work, because it had parts copied from the dashboard issues builder template. 2. The feed link from a group's activity page went to the dashboard feed, rather than the group's feed. Closes #15640 See merge request !4191
| | * | | | | | | | | | | | | | | | | | | | | | Link to group feed from group activity pageSean McGivern2016-05-182-1/+2
| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Point group's issues atom feed to groupSean McGivern2016-05-181-4/+4
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was using the user dashboard atom builder template, not one for the group's issues.
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'patch-1' into 'master' Dmitriy Zaporozhets2016-05-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken link in CI quickstart docs The newline between the `[label]` and the `(link)` caused it to be interpreted literally: http://doc.gitlab.com/ce/ci/quick_start/README.html See merge request !3541
| | * | | | | | | | | | | | | | | | | | | | | | Fix broken link in CI quickstart docs Florian2016-04-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The space between the [label] and the (link) caused it to be interpreted literally.
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'slack-issue-format' into 'master' Rémy Coutable2016-05-183-9/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve issue formatting in Slack service This will improve the looks of the message that gets send to Slack. **Before** ![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/670442d4d5cef5aa36753671b8894a75/image.png) **After** ![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/ab6e40a0c22ebe89ebd5b3652821c6dd/image.png) There is one thing I'm not certain about, thats sending the logo with the payload. Because this means we need to host the GitLab logo somewhere public, and every time a payload from any GitLab instance is send, we use that logo url. This might overload the server, or drive the bandwidth bill through the roof. This is something @sytses or @dzaporozhets have to decide about. @stanhu, you told me you were the author of the original code, maybe you can review? See merge request !1308
| | * | | | | | | | | | | | | | | | | | | | | | | Move to the latest version in the CHANGELOGJeroen van Baarsen2016-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Add changelog entryJeroen van Baarsen2016-05-181-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Improve issue formatting in Slack serviceJeroen van Baarsen2016-05-183-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix-typo-zen-control' into 'master' Dmitriy Zaporozhets2016-05-183-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed typo in zen.scss and corresponding views See merge request !4045
| | * | | | | | | | | | | | | | | | | | | | | | | | Fixed typo in zen.scss and corresponding viewsYatish Mehta2016-05-043-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'improve-license-doc' into 'master' Robert Speicher2016-05-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it clearer that /licenses is the OS license templates endpoint Following the discussion on https://gitlab.com/gitlab-org/gitlab-ce/commit/13804aba867d19009ca94d820aa7ec650a509f5a#note_4961954. Corresponding EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/407 See merge request !4188
| | * | | | | | | | | | | | | | | | | | | | | | | | Make it clearer that /licenses is the OS license templates endpointimprove-license-docRémy Coutable2016-05-181-1/+1
| | | |_|/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'remove-images-from-ci' into 'master' Rémy Coutable2016-05-186-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the images from GitLab CI Closes #17568 See merge request !4163
| | * | | | | | | | | | | | | | | | | | | | | | | | Clean up the images from GitLab CITakuya Noguchi2016-05-176-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'remove-bottom-margin-for-flash-message-on-project-home-page' ↵Dmitriy Zaporozhets2016-05-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Remove bottom margin for flash message on home page ### Flash Messages Remove `margin-bottom: 16px` from `.no-ssh-key-message` and `.project-limit-message`. This added an unnecessary margin between the notification and the content which was brought up in this issue #14797. ### Affected files: ./app/assets/javascripts/project.js.coffee: $(@).parents('.no-ssh-key-message').remove() ./app/assets/stylesheets/pages/projects.scss:.no-ssh-key-message, .project-limit-message { ./app/views/shared/_no_ssh.html.haml: .no-ssh-key-message.alert.alert-warning.hidden-xs ./app/assets/javascripts/user.js.coffee: $('.hide-project-limit-message').on 'click', (e) -> ./app/assets/javascripts/user.js.coffee: $(@).parents('.project-limit-message').remove() ./app/assets/stylesheets/pages/projects.scss:.no-ssh-key-message, .project-limit-message { ./app/views/shared/_project_limit.html.haml: .project-limit-message.alert.alert-warning.hidden-xs ./app/views/shared/_project_limit.html.haml: = link_to 'Remind later', '#', class: 'hide-project-limit-message alert-link' ### Screenshots: #### Before: ![Screen_Shot_2016-05-16_at_11.45.17_PM](/uploads/35f9db16526830e49bc302e2d00ecf7e/Screen_Shot_2016-05-16_at_11.45.17_PM.png) #### After: ![Screen_Shot_2016-05-16_at_11.38.24_PM](/uploads/b8f9ac29b574a99c962c52028f7e61dd/Screen_Shot_2016-05-16_at_11.38.24_PM.png) See merge request !4173
| | * | | | | | | | | | | | | | | | | | | | | | | | | Remove bottom margin for flash message on home pageCarlos Feliciano2016-05-161-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix 8.7.6 CHANGELOGRémy Coutable2016-05-181-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'fix/import-data-issue' into 'master' Rémy Coutable2016-05-187-29/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create import data in service and fix timing issues when scheduling job Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17401 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17376 See merge request !4106
| | * | | | | | | | | | | | | | | | | | | | | | | | removed transaction stufffix/import-data-issueJames Lopez2016-05-132-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | fix merge conflictJames Lopez2016-05-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-05-1230-111/+438
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix/import-data-issue
| | * | | | | | | | | | | | | | | | | | | | | | | | | looks like 8.7.6James Lopez2016-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | more changes based on MR feedbackJames Lopez2016-05-122-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | updated changelogJames Lopez2016-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | |