Commit Graph
28332 Commits
Author SHA1 Message Date
Rémy Coutable 129bb6c2a7 Address Yorick's feedback
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-18 23:45:25 -05:00
Rémy Coutable f29d8b64e4 Merge remote-tracking branch 'origin/master' into eReGeBe/gitlab-ce-feature/milestone-md
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-18 23:40:33 -05:00
Robert Speicher 4607323e13 Merge branch 'issue_17560' into 'master'
Mask credentials from URL when the import of project has failed.

REF: #17560 

See merge request !4185
2016-05-19 03:00:01 +00:00
Robert Speicher 26eb3dd731 Merge branch '17635-remove-unused-project-scopes' into 'master'
Remove unused Project scopes

Closes #17635.

See merge request !4204
2016-05-19 02:52:53 +00:00
Rubén Dávila 0c47b68d04 Mask credentials from URL when import of project has failed. 2016-05-18 21:16:36 -05:00
Rémy Coutable cf003760a5 Merge branch 'fix-changelog' into 'master'
Fix changelog for 7.9.3

Closes #1484 

See merge request !4202
2016-05-18 22:28:14 +00:00
Rémy Coutable 958ff11f97 Remove unused Project scopes
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-18 17:13:54 -05:00
Hannes Rosenögger 7254fb9e2b Merge branch 'master' into 'master'
fix example urls for (dis)associating runners to projects



See merge request !2993
2016-05-18 21:54:01 +00:00
Robert Schilling b330d5d016 Fix changelog for 7.9.3 [ci-skip] 2016-05-18 23:35:31 +02:00
Hannes Rosenögger 3019ab99bc Merge branch 'patch-1' into 'master'
doc: fix git lfs workaround for using http instead of https

the url should only point to `info/lfs` instead of `info/lfs/batch/objects`

See merge request !2713
2016-05-18 20:42:15 +00:00
Robert Speicher f3d52f8258 Merge branch '17628-remove-unused-methods' into 'master'
Remove User#tm_in_authorized_projects and User#tm_of

These methods seems to be unused.

Closes #17628.

Signed-off-by: Rémy Coutable <remy@rymai.me>

See merge request !4198
2016-05-18 20:17:02 +00:00
Robert Speicher 57fde5a83e Merge branch '15584-remove-back-compat-code' into 'master'
Remove back-compat code that's not needed anymore

Solves #15584.

See merge request !4187
2016-05-18 18:52:06 +00:00
Rémy Coutable b340ca356a Remove User#tm_in_authorized_projects and User#tm_of
These methods seems to be unused.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-18 13:43:33 -05:00
Kamil Trzciński 08fddae744 Merge branch 'docker-registry-view' into 'master'
Add container registry support

Tasks:

- [x] Merge docker/distribution authentication service: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3787
- [x] Implement Docker Registry API
- [x] Show a list of docker images in GitLab
- [x] Remove registry repository on project deletion
- [x] Support project rename, move and namespace rename
- [x] Use token when connecting the registry
- [x] Allow to delete images from GitLab
- [x] Support pushing from GitLab CI (gitlab-ci-token / $CI_BUILD_TOKEN)
- [x] Support GitLab Runner pulling for public repositories
- [ ] Support GitLab Runner pulling for private repositories
- [x] Add tests for Docker Registry API
- [x] Add tests for a views
- [x] Make texts nicer
- [x] Implement a backup support

- [ ] Create administration documentation https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4141
- [ ] Create user documentation

See merge request !4040
2016-05-18 18:19:01 +00:00
Dmitriy Zaporozhets b7d83acf5b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-05-18 12:48:50 -05:00
Dmitriy Zaporozhets 253a017b01 Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-18 12:48:23 -05:00
Rémy Coutable e577bf2d6d Merge branch '15640-confidential-issue' into 'master'
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
2016-05-18 17:36:55 +00:00
Dmitriy Zaporozhets 1227a1b239 Merge branch 'patch-1' into 'master'
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
2016-05-18 17:35:16 +00:00
Rémy Coutable 43493ecac1 Merge branch 'slack-issue-format' into 'master'
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
2016-05-18 17:30:26 +00:00
Kamil Trzcinski 2bea20b8ef Merge branch 'master' into docker-registry-view 2016-05-18 12:29:50 -05:00
Kamil Trzcinski 98a7486ba7 Verify if registry is enabled in registry 2016-05-18 12:28:48 -05:00
Dmitriy Zaporozhets 5da1c23b7f Merge branch 'fix-typo-zen-control' into 'master'
Fixed typo in zen.scss and corresponding views



See merge request !4045
2016-05-18 17:26:56 +00:00
Robert Speicher 6ed6e0f98e Merge branch 'improve-license-doc' into 'master'
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
2016-05-18 16:59:24 +00:00
Sean McGivern 66c421c0a7 Link to group feed from group activity page 2016-05-18 17:43:13 +01:00
Kamil Trzcinski 2f1cb7ce04 Improve code design 2016-05-18 11:22:28 -05:00
Jeroen van Baarsen 78e2d0ac3c Move to the latest version in the CHANGELOG 2016-05-18 11:12:21 -05:00
Jeroen van Baarsen afa3e1ded1 Add changelog entry 2016-05-18 11:09:51 -05:00
Jeroen van Baarsen 80817644a7 Improve issue formatting in Slack service
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2016-05-18 11:09:51 -05:00
Rémy Coutable 636b3ebb01 Merge branch 'remove-images-from-ci' into 'master'
Clean up the images from GitLab CI

Closes #17568

See merge request !4163
2016-05-18 15:48:20 +00:00
Dmitriy Zaporozhets c5e3c7974b Merge branch 'remove-bottom-margin-for-flash-message-on-project-home-page' 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
2016-05-18 15:44:20 +00:00
Rémy Coutable 3eacb19781 Fix 8.7.6 CHANGELOG
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-18 10:38:01 -05:00
Rémy Coutable f4d2a2d97b Merge branch 'fix/import-data-issue' into 'master'
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
2016-05-18 15:28:11 +00:00
Sean McGivern cf3b149e65 Point group's issues atom feed to group
This was using the user dashboard atom builder template, not one for the
group's issues.
2016-05-18 10:14:53 +01:00
Rémy Coutable f7bdbc0b55 Make it clearer that /licenses is the OS license templates endpoint
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-18 00:07:51 -05:00
Rémy Coutable 4e58aa40b9 Remove back-compat code that's not needed anymore
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-17 23:44:54 -05:00
Rémy Coutable da8ac1635f Merge branch 'issue_17302' into 'master'
Fix api leaking notes when user is not authorized to read noteable

fixes #17302

See merge request !4102
2016-05-18 04:31:12 +00:00
Felipe Artur 5bf49bb63d Move note helper method to notes entity file 2016-05-17 21:41:53 -05:00
Robert Speicher 98d88e8188 Merge branch 'fix/gitlab-import-data' into 'master'
fix typo making gitlab.com importing to fail

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565

See merge request !4181
2016-05-17 19:49:12 +00:00
Kamil Trzcinski 24145592e8 Provide full test coverage to lib/container_registry API implementation 2016-05-17 13:20:11 -05:00
Kamil Trzcinski a82109eee8 Add .gitkeep 2016-05-17 09:41:47 -05:00
James Lopez ab2a1d2345 added CHANGELOG 2016-05-17 15:29:53 +02:00
James Lopez 4e9ce5abe2 fix typo from bad refactoring 2016-05-17 15:19:59 +02:00
Kamil Trzcinski ac6992ba68 Fix specs 2016-05-16 23:40:40 -05:00
Kamil Trzcinski 0a6c3494b0 Fix rubocop offenses 2016-05-16 23:32:55 -05:00
Carlos Feliciano 256e0e8898 Remove bottom margin for flash message on home page 2016-05-16 23:36:42 -04:00
Rémy Coutable 28eea9bdfd Merge branch 'instrument-api-helpers' into 'master'
Instrument all Grape API helpers

This has been added to help us figure out what's making certain Grape API calls slow (e.g. the one used for authorized keys as described in gitlab-com/operations#99).

See merge request !4169
2016-05-16 23:12:55 +00:00
Kamil Trzcinski 04933fd572 Use container registry config stub 2016-05-16 18:07:49 -05:00
Kamil Trzcinski 8572a6b2d4 Always show documentation how to access images 2016-05-16 18:07:37 -05:00
Kamil Trzcinski 91c4002a0c Improve test coverage 2016-05-16 18:03:55 -05:00
Kamil Trzcinski 72a71e9d17 Show container registry item only when container registry is enabled 2016-05-16 17:38:58 -05:00