Commit Graph
1107 Commits
Author SHA1 Message Date
Jacob Schatz c426a571db Fix the situation where the user has named themselves "me"
Stopped looking for existing user since remove functionality is fixed.
2016-01-18 19:27:59 -05:00
Jacob Schatz c298068c45 Fix underlying issue with emoji reactions
Issue was: blank space was rendering
as a element in an array of authors.
Element was being used by `join`.
Original fix !2450 was trying to remove the space after it happened.
This checks properly for it and only moves forward if it does not exist.
Also removes "me" upon unchecking emoji.
2016-01-18 15:40:48 -05:00
Jacob Schatz 419bff801b Removing initial ,. 2016-01-18 13:37:26 -05:00
Jacob Schatz 62571ae1f2 Fixes tooltip doesn't duplicate the "me" name.
Checks that "me" is not in the array of names in tooltip
2016-01-18 13:37:26 -05:00
Robert Speicher 21ac92b8ba Merge branch 'remove-leading-comma-award-emoji' into 'master'
Remove leading comma when user is the only one to award that emoji

Fixes #9073

See merge request !2450
2016-01-18 18:28:39 +00:00
Dmitriy Zaporozhets 5433637d30 Merge branch 'comment-text-remains-in-text-box-after-submitting-it' into 'master'
Fixes issue where firefox does not delete message after comment submit

Issue was **not** in the way comment was being submitted.
`app/assets/javascripts/awards_handler.coffee` was throwing an error.
This error was preventing any js from running after it.
Fixes #1473

See merge request !2452
2016-01-18 00:19:34 +00:00
Zeger-Jan van de Weg 182cc843b0 Remove leading comma when user is the only one to award that emoji
Fixes #9073
2016-01-17 19:10:03 +01:00
Dmitriy Zaporozhets a6e073fa9b Merge branch 'issue-page-keeps-jumping-up' into 'master'
Issue page keeps jumping up

This happens when the discussion side is smaller than the sidebar and the sidebar will need to scroll. When this happens I calculate the height of the two and see if the discussion panel is smaller and make them the same height and add a class `no-affix` which makes the sidebar relative positioning so it won't stick to the top.

See merge request !2417
2016-01-17 17:01:35 +00:00
Robert Speicher 6754caed3c Autosize the textarea in showEditForm
[ci skip]
2016-01-16 22:17:57 -05:00
Jacob Schatz 604a811f80 Fixes issue where firefox does not delete message after comment submit
Issue was **not** in the way comment was being submitted.
`app/assets/javascripts/awards_handler.coffee` was throwing an error.
This error was preventing any js from running after it.
Fixes #1473
2016-01-15 14:06:31 -05:00
Jacob Schatz daf60957d9 Fix javascript error with deleting messages in issue or merge request
Elements searched for by jQuery no longer existed in the DOM.
Javascript was also unnecessarily complex, for using jQuery
Fixes #8109
2016-01-14 19:09:46 -05:00
Dmitriy Zaporozhets 0430c00cf0 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-01-14 16:19:38 +01:00
Dmitriy Zaporozhets fc9a2a3e70 Merge remote-tracking branch 'origin/rs-autosize' 2016-01-14 16:19:16 +01:00
Douglas Barbosa Alexandre 928c94807e Move js function to removing accents to vendor/assets/javascripts 2016-01-14 12:09:31 -02:00
Douglas Barbosa Alexandre aac6598482 Relax constraints for wiki slug
Since GitHub doesn’t apply these constraints to theirs wiki slug
allowing characters like `,`, `:`, `*`, etc, we need to relax our
constraints or some wiki pages will not be available after they were
imported.

For an example the Devise project have a wiki page with the following
slug: “How To: Add sign_in, sign_out, and sign_up links to your layout
template”
2016-01-14 12:09:31 -02:00
Dmitriy Zaporozhets e47f0e563d Merge branch 'closing-mr-bug-fix' into 'master'
fixes bug with commenting on merge requests



See merge request !2415
2016-01-14 13:14:50 +00:00
Dmitriy Zaporozhets 620d8b68a1 Merge branch 'remove-gray-bg'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-14 14:09:49 +01:00
Jacob Schatz 7b143a81f3 fixes scrollbar jump by making discussion the same size as the sidebar when sidebar is bigger, and not allowing affix to do fixed position on the sidebar 2016-01-13 18:54:11 -05:00
Jacob Schatz 1eb3e8acb6 fixes bug with commenting on merge requests 2016-01-13 16:57:46 -05:00
Jacob Schatz 46b56fc7ec initial fix 2016-01-13 16:46:40 -05:00
Robert Speicher 5987e88306 Fix missing autosize require 2016-01-13 16:13:34 -05:00
Robert Speicher 552c179acd Autosize textareas 2016-01-13 14:51:07 -05:00
Dmitriy Zaporozhets 6b31088fa1 Use closest instead of parent()
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-13 18:50:07 +01:00
Robert Speicher 12903762d1 Simplify broadcast message JS
Also resets the default example message when the user input is blank.
2016-01-13 11:34:58 -05:00
Robert Speicher 7e24c5c45a Move broadcast message form to a partial 2016-01-13 11:34:19 -05:00
Dmitriy Zaporozhets 3238b0bc9f Replace nav-tabs with nav-links
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-13 17:13:36 +01:00
Dmitriy Zaporozhets 3b3f755b5b New layout without background color
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-13 14:37:25 +01:00
Dmitriy Zaporozhets 96351a1e9f Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master'
Comment and close button does not submit comment



See merge request !2399
2016-01-13 09:13:17 +00:00
Jacob Schatz f01d052071 gets merge request discussion working again 2016-01-12 16:29:14 -05:00
Jacob Schatz d82d3ecd48 adds back in discussion.haml.html for issues commenting and closing/reopening properly. 2016-01-12 15:45:48 -05:00
Jacob Schatz e6f34237bc reverting MR ajax changes, which will be in a different MR 2016-01-12 14:44:07 -05:00
Jacob Schatz fa8b228f9d restores merge request coffee file 2016-01-12 13:58:10 -05:00
Robert Speicher d4ffe705eb Call clearInterval for the currentTimer if one exists
Prevents a double-click from causing the logo to sweep forever after a
load completes.
2016-01-11 18:37:20 -05:00
Jacob Schatz f2edb26a1e fixes conflicts 2016-01-11 18:06:15 -05:00
Douwe Maan 66dee188d8 Merge branch 'rs-zenmode-cleanup' into 'master'
Refactor ZenMode

- No longer depends on the "hidden checkbox".
- No longer depends on manually storing/restoring the scroll position.
  Instead, we take advantage of jquery.scrollTo.
- Event-based.
- Simplifies the state-based styling.

See merge request !2354
2016-01-11 13:50:30 +00:00
Yorick Peterse 569f5701ee Only load autocomplete data when actually needed
Previously this would result in autocomplete data being loaded for every
page (e.g. the page showing all Git branches of a project).
2016-01-11 11:13:11 +01:00
Dmitriy Zaporozhets ce066ba630 Merge branch 'autocomplete-on-load' into 'master'
Load autocomplete data when loading an issue page



See merge request !2312
2016-01-11 09:42:37 +00:00
Robert Speicher 89ca4f04f6 Refactor ZenMode
- No longer depends on the "hidden checkbox".
- No longer depends on manually storing/restoring the scroll position.
  Instead, we take advantage of jquery.scrollTo.
- Event-based.
- Simplifies the state-based styling.
2016-01-08 23:36:09 -05:00
Robert Speicher af68897acd Merge branch 'api-project-upload' into 'master'
Add API project upload endpoint

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317

See merge request !2329
2016-01-08 20:29:43 +00:00
Yorick Peterse cb22e5f942 Load autocomplete data when loading an issue page
This ensures the dropdown is fully available the moment a user starts
typing out a username, issue ID, etc. While this won't speed up loading
the autocomplete data itself it should at least make it less annoying
for the user.
2016-01-08 17:16:39 +01:00
Jacob Schatz ab9612df8d initial json requests instead of HTML 2016-01-07 11:47:39 -05:00
Dmitriy Zaporozhets c7fc84f516 Use fadeTo instead of css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-07 15:16:12 +01:00
Dmitriy Zaporozhets 44dc9aa69e Fix typo in js method and some repeating css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-07 15:16:12 +01:00
Dmitriy Zaporozhets b2b4e9a7eb Prevent loading first 20 commits twice
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-07 15:16:11 +01:00
Dmitriy Zaporozhets d1a40e06cc Add ajax filtering for commits list
Also handle commits list with Pager class to prevent code duplication

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-07 15:16:11 +01:00
Douwe Maan 1886d727f7 Add API project upload endpoint 2016-01-07 13:37:14 +01:00
Dmitriy Zaporozhets 8d0886d6d0 Merge branch 'fix-missing-day-in-network-graph' into 'master'
Fix missing date of month in network graph when commits span a month

Closes #3635, #1383

Before:

![image](/uploads/6a169e0cd402cb26f3a2cf13bd0ecc88/image.png)

After:

![image](/uploads/2600a454394383660a1e50a4a1ba1204/image.png)


See merge request !2325
2016-01-07 12:10:57 +00:00
Jacob Vosmaer 41b8a238ce Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-01-07 12:56:18 +01:00
Stan Hu 7d013f7848 Fix missing date of month in network graph when commits span a month
Closes #3635, #1383
2016-01-06 21:05:46 -08:00
Jacob Schatz cbdc8dd46f adds ajax open and close merges, with discussion/comments working as well 2016-01-05 20:42:25 -05:00