Commit Graph
28338 Commits
Author SHA1 Message Date
Fatih Acet c2bd71fda6 " ➡️ '. 2016-05-25 16:05:56 +03:00
Fatih Acet 20e6e0dbe6 Handle posting emoji only vote +1 and -1 comments.
And remove mutual votes.
2016-05-24 20:47:10 +03:00
Fatih Acet b0082bec73 Get award menu url from gl object. 2016-05-24 19:34:08 +03:00
Fatih Acet c697c9601d Fix award tooltip after voting. 2016-05-24 03:44:19 +03:00
Fatih Acet 1d7c3c79b1 Handle thumbsup and thumbsdown mutuality. 2016-05-24 03:10:38 +03:00
Fatih Acet 5b046f8571 Fix variable name because of a wrong resolved merge conflict. 2016-05-23 22:38:34 +03:00
Fatih Acet 68c74f9de1 Merge branch 'awardables-merge' of gitlab.com:gitlab-org/gitlab-ce into awardables-merge
# Conflicts:
#	app/assets/javascripts/notes.js.coffee
2016-05-23 22:30:20 +03:00
Fatih Acet 85e9eece7e Fix displaying emoji only comments.
To render emoji in the emoji bar of an issue or MR we actually need the emoji unicode and unicode info is stored in the emoji menu widget. That widget could only be visible if user clicks the "Add" button and there may not be a widget when posting emoji only comments. So this change will check existence of the widget and create it before posting the emoji if it's not exist to render it correctly.
2016-05-23 21:33:58 +03:00
Fatih Acet e8c8c9d7b2 Fix emoji counter issue. 2016-05-23 21:25:45 +03:00
ZJ van de Weg 6d19d6a2fd minor js fixes 2016-05-20 20:17:49 -05:00
ZJ van de Weg 4d6c51e228 Fix backend merge mistakes
[ci skip]
2016-05-19 15:00:50 -05:00
Fatih Acet b40afae62c Add Gitlab namespace AwardEmoji. 2016-05-19 14:18:33 -05:00
Phil HughesandFatih Acet 783a5ae98c Adds the emoji menu to the body and then re-positions it depending on which button clicked
This spots bugs where the menu could be in a div that has overflow hidden on ie. diff comments
2016-05-19 14:13:16 -05:00
Phil HughesandFatih Acet bf96c30510 Award spec for merge requests 2016-05-19 14:13:10 -05:00
Phil HughesandFatih Acet 44876032a2 Added tests for issues 2016-05-19 14:13:05 -05:00
Phil HughesandFatih Acet 797acde046 Tooltip placement on award buttons 2016-05-19 14:12:59 -05:00
Phil HughesandFatih Acet f6a7b3c37a Hides award bar when editing a note 2016-05-19 14:12:52 -05:00
Phil HughesandFatih Acet 3d4d8e5907 Changed design of inline award picker to be similar to designs
# Conflicts:
#	app/views/votes/_votes_block.html.haml
2016-05-19 14:12:37 -05:00
Phil HughesandFatih Acet 7d4f41efde Removed console log 2016-05-19 14:11:27 -05:00
Phil HughesandFatih Acet 9e8449b1af Hides the row in notes body when empty of emojis 2016-05-19 14:11:20 -05:00
Phil HughesandFatih Acet 25a4893215 Removes buttons in notes body 2016-05-19 14:11:10 -05:00
Phil HughesandFatih Acet f2f2e07294 Shows the bar on notes if a new award is added
Correctly adds/removes awards in notes

# Conflicts:
#	app/models/concerns/awardable.rb
#	app/views/projects/issues/show.html.haml
#	app/views/projects/merge_requests/_show.html.haml
2016-05-19 14:10:59 -05:00
Phil HughesandFatih Acet 0b45cf55dd Uses the same emoji-menu and just moves it around depending where it should be viewed
# Conflicts:
#	app/assets/javascripts/awards_handler.coffee
#	app/assets/stylesheets/pages/notes.scss
#	app/helpers/issues_helper.rb
#	app/views/projects/notes/_note.html.haml
2016-05-19 14:07:27 -05:00
Phil HughesandFatih Acet 4caf38a1d5 Refactored JS slightly to make things easier
# Conflicts:
#	app/assets/javascripts/awards_handler.coffee
#	app/views/emoji_awards/_awards_block.html.haml
2016-05-19 14:04:48 -05:00
Fatih Acet 6c89e2fd41 Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardables 2016-05-18 13:23:40 -05:00
Fatih Acet a410c7afbf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables 2016-05-18 13:20:06 -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
Fatih Acet bb883387f9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/models/note.rb
#	db/schema.rb
#	spec/models/note_spec.rb
2016-05-18 13:05:53 -05: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
ZJ van de Weg e0cabb67d0 Fix latests concerns 2016-05-18 08:47:15 -05: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 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