home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,211 Commits 48 Branches 340 Tags
8b3285bfdffc3ee6a2fbd65a8d7981214344deda
Commit Graph
1125 Commits
Author SHA1 Message Date
Jacob Schatz d3f24a2221 Adds base64 background search icon. 
All inputs of type `search` will have the gray background
and search icon centered.
Because the search magnifier is a bg image,
I had to hide it with `[value=""]`.
I added a little javascript to make sure each input always has it's
own value.
 2016-01-24 20:20:03 -05:00
Robert Speicher d668266306 Merge branch 'rs-no-minified-js' 
Don't vendor minified JS

Fixes #4031

See merge request !2494
 2016-01-23 17:45:39 -08:00
Dmitriy Zaporozhets 56b527093d Merge branch 'fix-comment-on-diff-ajax-loading' 2016-01-22 10:20:19 -08:00
Grzegorz Bizon 66b0927bb5 Move build artifacts javascripts into separate file 2016-01-21 15:51:44 +01:00
Rémy Coutable dfdf189135 Fix indentation of methods chaining in Coffee 
[ci skip]
 2016-01-20 23:24:13 +01:00
Rémy Coutable 8a829c9738 Merge remote-tracking branch 'origin/master' into fix-comment-on-diff-ajax-loading 2016-01-20 22:42:07 +01:00
Rémy Coutable 12da27090f Address some JS coding-style and HTML semantic issues 
- Replace 'rel' attributes with 'data' or 'id' attributes
- Style jQuery methods chaining according to Jacob's guidelines
- Rename a method
 2016-01-20 22:39:32 +01:00
Dmitriy Zaporozhets 7c01a91bb7 Merge branch 'awardemoji-tooltip-shows-people-multiple-times' into 'master' 
Fixes tooltip doesn't duplicate the "me" name.

Checks that "me" is not in the array of names in tooltip

![emojilist](/uploads/20b1a39cda194358f9730ec3c6b86acb/emojilist.gif)

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/7978


See merge request !2454
 2016-01-20 17:50:00 +00:00
Dmitriy Zaporozhets 5ad60c5dda Merge branch 'secret-shortcut-feature' into 'master' 
Adds "t" as a shortcut for find file anywhere



See merge request !2507
 2016-01-20 16:39:43 +00:00
Douglas Barbosa Alexandre e9fb875588 Don't vendor minified fuzzaldrin-plus 
This version was compiled to use in the browser through Browserify.
More info or how to compile a new version:
https://gitlab.com/dbalexandre/fuzzaldrin-plus-browserify
 2016-01-20 01:25:22 -02:00
Douglas Barbosa Alexandre e202564a3a Don't vendor minified jQuery.nicescroll 2016-01-20 01:25:22 -02:00
Douglas Barbosa Alexandre f3c33b3303 Don't vendor minified g.bar.js 2016-01-20 01:25:22 -02:00
Douglas Barbosa Alexandre 37d3728dc5 Don't vendor minified g.raphael.js 2016-01-20 01:25:22 -02:00
Robert SpeicherandDouglas Barbosa Alexandre 2922dfce79 Don't vendor minified Chart.js 
The filename is titlecased because that's how it came from the vendor,
and we're not touching it.
 2016-01-20 01:25:22 -02:00
Jacob Schatz e5cbd5885a Fixes issue where other emoji (not thumbup/thumbdown) were not removed 2016-01-19 15:43:04 -05:00
Jacob Schatz 34564296d0 Adds t as a shortcut for find file anywhere 2016-01-19 14:25:27 -05:00
Rémy Coutable 491c2248c0 Fix diff comments loaded by AJAX to load comment with diff in discussion tab 
This commits also fixes two minor issues:
- Ensure notes that the current user is not allowed to see are not
  returned in the AJAX notes loading
- Ensure the notes counter badge is decremented of 1 instead of 2
 2016-01-19 18:22:01 +01:00
Phil Hughes 2821306a74 when starring a project it correctly increase the star count 
This is instead of increasing star & fork count

Fixed #11396
 2016-01-19 16:48:53 +00:00
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