Commit Graph
929 Commits
Author SHA1 Message Date
Grzegorz BizonandRobert Speicher 23975e093b Merge branch 'fix/award-emoji-conflict-in-notes' into 'master'
Fix problems with award-emoji-only comment

This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.

Closes #3734 

cc @vsizov

See merge request !1936
2015-12-07 14:33:36 -05:00
Robert SpeicherandRobert Speicher dbcd646296 Merge branch 'award_fix' into 'master'
Emoji bug: Invalid url to image

Closes #3591

See merge request !1868
2015-11-21 23:11:45 -05:00
Valery Sizov c279bd812e Fix for Emoji 2015-11-20 11:23:04 +02:00
Dmitriy ZaporozhetsandRobert Speicher 48e86ec610 Merge branch 'emoji_votes' into 'master'
Award Emoji

This it first iteration of award emoji feature.
We have plan to extend emoji picker by the next release.

For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like "👍" and any other. You can post not only emoji that listed in the emoji picker.

See merge request !1825
2015-11-19 19:50:58 -05:00
Robert SpeicherandRobert Speicher 34207d1dfb Merge branch 'rs-safari-clipboard-fallback' into 'master'
Add a fallback for Safari copy-to-clipboard

Also, hide the tooltip in a less stupid way.

Closes #3547

See merge request !1844
2015-11-19 18:25:59 -05:00
Robert SpeicherandRobert Speicher 463a3cfe09 Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master'
Add option to create merge request when editing/creating a file

Replaces !1611 

Fixes #3059

See merge request !1820
2015-11-19 11:46:24 -05:00
Robert Speicher 17a0cd46cc Merge branch 'contributor-graph-by-email' into 'master'
See merge request !1705
2015-11-17 13:49:48 -05:00
Robert Speicher df0110ba81 Merge branch 'rs-revert-gh-9820' into 'master'
Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"

This reverts commit 63144cd062, reversing
changes made to 8ab5df9d87.

Reverts https://github.com/gitlabhq/gitlabhq/pull/9820

See merge request !1804
2015-11-17 15:09:22 +00:00
Robert Speicher c8e53d4467 Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"
This reverts commit 63144cd062, reversing
changes made to 8ab5df9d87.
2015-11-16 13:08:08 -05:00
Dmitriy Zaporozhets f16f315115 Few changes to Group Milestone feature:
* Group attachments are not supported so I removed attach file link
* Added changelog item
* Add markdown hint to project milestone form

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 15:07:16 +01:00
Jason Lee 1974087114 Avoid render edit_form in each notes.
Use RJS to render edit note feature.

Before:

```
Rendered projects/notes/_note.html.haml (27.9ms)
Rendered projects/_zen.html.haml (0.3ms)
Rendered projects/notes/_hints.html.haml (0.7ms)
Rendered projects/_md_preview.html.haml (3.9ms)
Rendered projects/notes/_edit_form.html.haml (6.9ms)
Rendered projects/notes/_note.html.haml (17.7ms)
Rendered projects/_zen.html.haml (0.3ms)
Rendered projects/notes/_hints.html.haml (0.6ms)
Rendered projects/_md_preview.html.haml (3.4ms)
Rendered projects/notes/_edit_form.html.haml (7.0ms)
```

After:

```
Rendered projects/notes/_note.html.haml (13.8ms)
Rendered projects/notes/_note.html.haml (7.1ms)
Rendered projects/notes/_note.html.haml (9.5ms)
Rendered projects/notes/_note.html.haml (8.5ms)
```

This change reduce at least 6ms * N ('N' - number of notes).
2015-11-12 13:16:35 +08:00
Dmitriy Zaporozhets 312cf11b61 Add release description to new tag form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-05 14:03:48 +01:00
Dmitriy Zaporozhets a4d75e3aec Add ability to edit and show release notes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-05 12:15:25 +01:00
Dmitriy Zaporozhets c5d637b2ca Improvements to profile page UI
* add separator between tabs
* show project avatars
* fix tooltip offset on user calendar
* remove gray hover for tabs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-04 14:13:25 +01:00
Dmitriy Zaporozhets 4d7f00fdea Apply new design for user profile page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-03 15:32:40 +01:00
Robert Speicher 3b0039f659 Persist blob editor's value on submit, not on click
Prior, the value of the Ace editor was only being persisted if the user
physically clicked the submit button, which the "quick submit" behavior
doesn't do.

Now the value will be properly transferred before any form is submitted.
2015-10-31 16:08:34 +01:00
Dmitriy Zaporozhets 0bb50ea081 Merge branch 'rs-clipboard-js' into 'master'
Add "Copy to clipboard" buttons

See #2855

See merge request !1494
2015-10-23 14:39:03 +00:00
Robert Speicher c05275a201 Add copy_to_clipboard JS 2015-10-23 15:29:09 +02:00
Kamil Trzcinski 127836dd54 Fix small CI UI regressions 2015-10-23 11:45:45 +02:00
Kamil Trzcinski c21d46c29f Fix build trace updating 2015-10-21 12:34:25 +02:00
Kamil Trzciński daccc54d25 Merge branch 'builds-view' into 'master'
Added builds view

![Screen_Shot_2015-10-13_at_19.02.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/95bb3a7d9d603678fdd077558637045d/Screen_Shot_2015-10-13_at_19.02.48.png)

/cc @dzaporozhets @vsizov 


See merge request !1593
2015-10-15 11:35:57 +00:00
Robert Speicher fc0d92746d Prevent a JS error in MergeRequestTabs
When `window.location.hash` is pointing to a note, e.g. `#note_1234`,
`scrollToElement` would throw an error because a selector such as
`.commits #note_1234` doesn't exist, so `offset()` returned `undefined`.

This error would prevent subsequent calls from running, which caused the
loading spinner to never be hidden.

Now we ensure the selector returns a valid element before trying to
scroll to it.
2015-10-14 15:01:25 -04:00
Kamil Trzcinski a957eca6f3 Added builds view 2015-10-14 17:28:38 +02:00
Dmitriy Zaporozhets a0a488ed13 Apply new design to files page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-13 16:41:48 +02:00
Douwe Maan 192dd58d03 Merge branch 'rs-mr-tab-loader' into 'master'
Make the loading spinner toggle more explicit

Occasionally the loading spinner would stay visible after the tab
finished loading. This change makes the toggle explicit so that it's
always shown on `beforeSend`, and always hidden on `complete`.

Plus a bonus semi-colon eradication! 💥

See merge request !1553
2015-10-09 11:36:15 +00:00
Han Loong Liauw 95411f7151 fixed positioning of hamburger menu on header
- Changed to margin for vertical allign as used in bootstrap 3 original
 - Also added an `active` state to show when the extra items are enabled
2015-10-09 14:05:55 +11:00
Robert Speicher 29fe488b0c Make the loading spinner toggle more explicit
Occasionally the loading spinner would stay visible after the tab
finished loading. This change makes the toggle explicit so that it's
always shown on `beforeSend`, and always hidden on `complete`.

Plus a bonus semi-colon eradication! 💥
2015-10-08 20:53:29 -04:00
Robert Speicher dbf9ccbcfe Check originalEvent.repeat *and* event.repeat
phantomjs < 2.0 doesn't support creating `KeyboardEvent` so the tests
were failing on CI
2015-10-07 17:59:10 -04:00
Robert Speicher fcf99d0d09 Check originalEvent.repeat 2015-10-07 15:23:42 -04:00
Robert Speicher 2ed5a5b70d Remove "quick submit" behavior specific to the Notes JS 2015-10-07 15:23:42 -04:00
Robert Speicher 01d0926bc1 Add "Quick Submit" JS behavior 2015-10-07 15:23:41 -04:00
Robert Speicher 38fbfb9fe6 Require jquery.turbolinks in all JS specs
Side-effect: This simplifies the requiresInput handler
2015-10-07 15:23:41 -04:00
Dmitriy Zaporozhets 030b5038b1 Merge branch 'cleanup-ci-pages' into 'master'
Cleanup CI pages

- [x] Remove `ci/projects/:id` page
- [x] Remove Continuous integration from project menu
- [x] Remove unused css/js
- [x] Remove Ci::Commit and Ci::Build controllers
- [x] Move CI services to project settings area


cc @ayufan 

Part of #2594

See merge request !1529
2015-10-07 17:04:54 +00:00
Dmitriy Zaporozhets 3fa2cb9335 Remove unused JS
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-07 14:59:37 +02:00
Stan Hu 0ab6ca93aa Add directory feature button
Change "+" icon under "Files" section to have three options:

* Create file
* Upload file
* New directory

Upload file is no longer accessible from the "Create file" page.
Users can now select a target branch in upload file as well.

Closes #2799: Fixes a bug where file modes were overwritten after a commit

Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files
can no longer be overwritten in the "Create file" section.

Closes #2557
2015-10-07 04:22:55 -07:00
Valery Sizov 1a86a00ca3 Fix search in Files 2015-10-06 11:43:32 +03:00
Valery Sizov 31330e4a3c Fix anchors to comments in diffs 2015-10-05 14:00:41 +03:00
Robert Speicher 8366ce364c Merge branch 'rs-update-note' into 'master'
Ensure updated notes are syntax highlighted

See merge request !1444
2015-10-01 17:10:52 -04:00
Valery Sizov 05fdd12fd9 Improve error message when merging fails 2015-10-01 09:45:47 +03:00
Robert Speicher 7c20f30f05 Ensure notes are highlighted properly when they're updated 2015-09-30 16:58:35 -04:00
Dmitriy Zaporozhets 0731a7af31 Show only enabled CI projects
Since CI is enabled by pushing .gitlab-ci.yml file there is no need to
add CI project via dashboard

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-23 15:00:05 +02:00
Douwe Maan 183892fde9 Merge branch 'notification-levels' into 'master'
Notification levels can now be set on the Project's main page

![Screen_Shot_2015-09-16_at_7.49.49_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0ac517bdfdc801f0e2115463c3ea9e10/Screen_Shot_2015-09-16_at_7.49.49_PM.png)

The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level.

Saving is done via a remote form submission and if successful shows the user a flash message:

![Screen_Shot_2015-09-16_at_6.09.02_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8a6e1fde5177aa3976cadf59fdb8d375/Screen_Shot_2015-09-16_at_6.09.02_PM.png)

@DouweM can you please review my code. I gave my bestest effort to make in clean and readable.

@rspeicher hopefully we can include it with the 8.0 release, maybe?

/cc @darby 

See merge request !1322
2015-09-21 09:19:32 +00:00
Robert Speicher 68b15af46c Fix IssuableContext javascript
We were calling `affix` before the events were bound so they never
triggered correctly.

Closes #2597
2015-09-18 16:35:38 -04:00
Patricio Cano 1ddefa3bea Merge branch 'master' into notification-levels 2015-09-16 19:54:18 -05:00
Patricio Cano 1ef2ce95d5 Merge branch 'master' into notification-levels 2015-09-16 19:52:57 -05:00
Patricio Cano 4c98357f16 Added Global to the drop downs and updated the label of the button to show the current level instead of Notifications 2015-09-16 19:46:24 -05:00
Kamil Trzcinski fb9cb3f06c Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-15 23:20:00 +02:00
Kamil Trzcinski e21deaee8e Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
# Conflicts:
#	Gemfile.lock
2015-09-15 22:40:35 +02:00
Stan Hu d9af6f79ed Change the replace placeholder to use the filename
Dynamically adjust placedholder for uploads and fix Dropzone event handlers

Override error handler to prevent error messages from being inserted underneath image preview

Fix tests

Use regexp instead of startsWith for better browser compatibility

Remove duplicate code in _replace.html.haml and use one template

Remove files upon error and retain alert messages until user adds a new file
2015-09-15 13:07:32 -07:00
Patricio Cano fa6df2228e Replaced this with @ in the coffee file and added an arrow that clearly marks the Notifications button as a drop down 2015-09-14 20:50:13 -05:00