home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
604 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets eee14a0c74 Merge branch 'fix-scroll-to' into 'master' 
Fix js error when use scroll to highlighted line
 2014-05-22 20:17:15 +00:00
Dmitriy Zaporozhets 74079fe236 Fix scroll to highlighted line. Replace scrollTO js file with gem 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 18:19:50 +03:00
Olaf Mandel c18e2778b2 Fix avatar URLs in JS-lists for relative_url_root 
In user lists created when entering a (partial) user name into
a field, the URL to the user avatar was invalid if running with
relative_url_root.

This patch is the result of:
sed -i 's/\(= *\)\(user\.avatar_url\)/\1gon.relative_url_root + \2/' \
    app/assets/javascripts/*.coffee
 2014-05-20 15:22:23 +02:00
Evgeniy Sokovikov 24b68fdada fix ctrl+enter note send 
use argument e instead of event
 2014-05-14 13:13:05 +04:00
Dmitriy Zaporozhets 4ca1a29de8 Merge pull request #6934 from skv-headless/ctrl_enter_form_submit 
submit notes forms by pressing ctrl+enter
 2014-05-08 21:31:25 +03:00
Dmitriy Zaporozhets 2da289cf22 Add assignee and milestone to 2nd step 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:52:59 +03:00
skv-headless a8624cbe59 submit notes forms by pressing ctrl+enter 2014-05-07 17:50:56 +04:00
Jacob Vosmaer 0b914e7ceb Refresh notes when the page becomes visible 2014-04-29 17:21:58 +02:00
Jacob Vosmaer e52f50c22f Do not refresh notes on hidden tabs 2014-04-29 17:21:58 +02:00
Jacob Vosmaer 7ec5ff4dba Pass last_fetched_at for notes to javascript 2014-04-28 12:21:49 +02:00
Evan Lucas 4134b38a84 Fix syntax highlighting 
Don't break highlighting on multi-line spans (multi-line comments for
example)
 2014-04-22 17:06:16 -05:00
Thomas MoschnyandMarin Jankovski 5b123dbf7f Fix avatars in the network graph for relative-url setups. 2014-04-10 10:05:40 +02:00
Dmitriy Zaporozhets 8e7f80eed1 Restyle merge request accept and ci widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-06 17:10:37 +03:00
Dmitriy Zaporozhets 1a17289bd3 Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/javascripts/merge_requests.js.coffee
	app/assets/stylesheets/sections/merge_requests.scss
	app/controllers/projects/merge_requests_controller.rb
 2014-04-06 13:54:54 +03:00
Dmitriy Zaporozhets 76c4421b26 Merge pull request #6639 from yatish27/ConsistentJSFormat 
Consistent format for class objects in javascript
 2014-04-03 11:36:44 +03:00
Marin Jankovski 7ab46b969f Do not require modernizr. 2014-04-03 08:49:34 +02:00
Yatish Mehta fcdb34373f Consistent format for class objects in javascript 2014-03-28 14:01:06 +05:30
Dmitriy Zaporozhets 3ef0a625ac Applications js to coffee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-24 16:12:23 +02:00
Marin Jankovski 5e985a7eed Use emoji assets on autocomplete. 2014-03-24 14:22:11 +01:00
Dmitriy Zaporozhets c1fd25ce6e Replace turbolink spinner with nprogress 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-19 12:59:23 +02:00
Dmitriy Zaporozhets 7157f79caa Refactor js behaviours helpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 15:15:08 +02:00
Robert Speicher 1688a29023 Add GFM autocompletion for MergeRequests 
Requested
[here](http://feedback.gitlab.com/forums/176466-general/suggestions/5507440-auto-complete-merge-requests-in-gitlab-markdown).
 2014-03-05 23:24:03 -05:00
Jason Blanchard 3ada1d7ec3 Added option to remove issue assignee on project issue page and issue edit page 2014-03-02 13:10:45 -05:00
Dmitriy Zaporozhets 8907a95869 Fix commit image js 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 21:54:12 +02:00
Dmitriy Zaporozhets 58634dfb6a New class names in notes css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-24 09:43:45 +02:00
Dmitriy Zaporozhets b05a67f4e3 Split merge request coffee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 16:22:57 +02:00
Dmitriy Zaporozhets 8a55636f89 Dont replace all issue context when change assignee/milestone 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-18 13:15:43 +02:00
Dmitriy Zaporozhets 67798492bc Add placeholder support for project_users_select_tag 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 16:16:23 +02:00
Dmitriy Zaporozhets f0f88390c1 project_user selectbox with ajax autocomplete 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 16:08:26 +02:00
Dmitriy Zaporozhets 1d48904ac8 Show avatars in ajax user selectbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-13 15:45:24 +02:00
Dmitriy Zaporozhets 348e44ef06 Dont use avatars for user select if avatar is disabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-11 15:49:39 +02:00
Dmitriy Zaporozhets 1794f606bd Use ace editor as gem 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-10 16:18:46 +02:00
robertd b8e81e558f Show avatars of groups on profile screen that user belongs to 2014-02-06 23:27:32 -07:00
Dmitriy Zaporozhets a184fcf368 Merge pull request #6178 from Popl7/add_group_avatars 
added group avatars
 2014-01-28 00:26:18 -08:00
Steven Thonus 251df827a5 added group avatars 2014-01-28 08:38:00 +01:00
Dmitriy Zaporozhets 891ea6f6e6 Improve highlight for notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-27 18:18:18 +02:00
Dmitriy Zaporozhets f304f975d6 Fix blob multiline highlight 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-27 14:21:40 +02:00
Dmitriy Zaporozhets ffee5bb090 Improve themes. Load highlight.js properly 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-26 22:00:23 +02:00
Dmitriy Zaporozhets 76be57fcf2 Init highlgiht js and render for blob. Improve css for it 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-26 21:34:22 +02:00
Dmitriy Zaporozhets c7966a426b Include highlight.js assets 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-26 21:33:04 +02:00
Dmitriy Zaporozhets 073a269831 Refactor search autocomplete. Use ajax for source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 14:16:46 +02:00
Dmitriy Zaporozhets 38d8d749d7 Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq 2014-01-15 10:36:12 +00:00
Dmitriy Zaporozhets e19d05ddd6 Fix issues selects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 21:07:59 +02:00
Dmitriy Zaporozhets 99a2b31e98 Dont allow merge without commit message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 19:56:52 +02:00
Jeroen van Baarsen d5bb466fe4 Fix for #5767 
In the branch graph, uploaded images where not rendered
correctly. Fixed this by not filling the rect, instead
i've put an image over it
 2014-01-13 22:22:46 +01:00
Dmitriy Zaporozhets 9c7d821cf7 Show selected attachment in comment form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-12 18:47:58 +02:00
Dmitriy Zaporozhets 4434f93aa9 Select2 dropdown autoWidth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 12:36:10 +02:00
Dmitriy Zaporozhets 8a17961126 Replace chosen with select2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 12:11:54 +02:00
Jason Hollingsworth 04baf0b569 Update clone panel to use input group. 
Use clone panel in `Git Access` section of wiki.
 2014-01-08 10:06:03 -06:00
Dmitriy Zaporozhets ac6c050773 Fix network tests. Removed console.log 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-05 13:41:09 +02:00