home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,391 Commits 48 Branches 340 Tags
4ddabdd7934ea5213dae626fcea841024fc964db
Commit Graph
555 Commits
Author SHA1 Message Date
Marin Jankovski 4ddabdd793 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-09-22 14:38:02 +02:00
Marin Jankovski f0231e409a Revert "Diff headers made sticky." 
This reverts commit 6eb85b1a30.
 2014-09-22 13:48:28 +02:00
Robert Schilling 28ba985ef9 Save last scrollposition and scroll back when leaving ZEN mode 2014-09-21 21:06:38 +02:00
Robert Schilling d5badd7ef6 Prevent default action when closing zen mode 2014-09-20 18:15:36 +02:00
Ciro Santilli 04ef3ddc6c Improve zen mode internals. 2014-09-19 17:32:23 +02:00
Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre 
Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-09-15 11:24:51 +02:00
Robert Schilling 0d5958c729 Close Zen mode by ESC, foward/backward 2014-09-11 19:24:51 +02:00
Robert Schilling 58c0a4f5cf Implement zen mode for issues/MRs/notes 
Close Zen mode by ESC, foward/backward
 2014-09-11 19:24:51 +02:00
Dmitriy Zaporozhets 29e7647a08 Merge branch 'close_button_after_added_comment' into 'master' 
Close button after added comment

Fixes #1549

See merge request !1070
 2014-09-09 11:02:10 +00:00
Robert Schilling 7f7bf86bbf Change shortcut for activity to project, because navbar changed 2014-09-08 20:49:15 +02:00
Marin Jankovski dac5e6de5a After comment is added, button should go back to Close button. 2014-09-08 14:07:31 +02:00
Dmitriy Zaporozhets 5f6eb09cdf Improve issue filtering. Make tests pass 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-03 19:18:23 +03:00
Dmitriy Zaporozhets 99425a124c Post comment when hit close/reopen btn in comment form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-01 15:37:53 +03:00
Dmitriy Zaporozhets 20dbc2a139 Merge pull request #7425 from Razer6/remove_dup_javascript 
Remove duplicated setupNoteForm method
 2014-09-01 14:03:10 +03:00
Robert Schilling 0cbc19f944 Awesome shortcuts for GitLab 2014-09-01 11:49:17 +02:00
Dmitriy Zaporozhets 22a7fcab8c Merge pull request #7620 from zzet/patch-11 
Add search in textarea
 2014-08-28 16:49:42 +03:00
Dmitriy Zaporozhets 8289308933 Restyle project home 
* more focus for description and stars/forks
* rename activity -> to project tab
* put activity under tab: prepare place for README tab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 14:19:11 +03:00
Andrew Kumanyaev f9c7f41476 Add missing ext for searchbox 2014-08-28 12:08:02 +04:00
Dmitriy Zaporozhets 67d96b0f36 Merge pull request #7611 from yglukhov/sticky-diff-headers 
Diff headers made sticky.
 2014-08-27 17:22:17 +03:00
Yuriy Glukhovanduran 0bf45aece3 Added a checkbox to toggle line wrapping in diff. 2014-08-27 11:21:58 +03:00
uran 6eb85b1a30 Diff headers made sticky. 2014-08-27 00:24:49 +03:00
Marin Jankovski 1cfe341589 Advise to refine search when no match is returned. 2014-08-25 12:39:45 +02:00
Marin Jankovski e8da7b8077 Merge remote-tracking branch 'CE/master' 
Conflicts:
	doc/workflow/README.md
 2014-08-21 10:57:39 +02:00
Robert Schilling 64102476dc Call updateColorPreview in Labels constructor 2014-08-20 18:11:51 +02:00
Jacob Vosmaer d155b3e72c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-08-20 14:36:07 +02:00
Martin Bastien 8eff8bcebf Fix color toggle for labels in edit view 2014-08-18 12:23:45 -04:00
Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 
Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb
 2014-08-15 10:25:23 +02:00
Dmitriy Zaporozhets 433dac7799 Merge pull request #7465 from Razer6/better_label_color_validation 
Better label color validation, fixes #7454
 2014-08-15 10:17:16 +03:00
skv 4e40800166 diff unfold 2014-08-14 15:48:14 +04:00
Robert Schilling 04ad197bcc Trigger an update of save button if user pressed a preview color 2014-08-13 15:48:26 +02:00
Robert Schilling 6085b6a765 Move label coffeescript from view to class 2014-08-13 15:48:26 +02:00
Robert Schilling 0b5e0e4c55 Disable label submit button if any field is empty 2014-08-13 15:48:26 +02:00
Dmitriy Zaporozhets 32de669159 Merge pull request #7189 from skv-headless/fix_duplicate_event_loading 
prevent events duplication loading
 2014-08-13 16:46:00 +03:00
Dmitriy Zaporozhets 3c046cc4e7 Merge pull request #7426 from Razer6/rtrim_note_input 
rtrim() input before checking if note form is empty
 2014-08-13 16:41:08 +03:00
Robert Schilling 15c682fcb0 Disable 'Save changes' button if input is empty, fixes #6351 2014-08-04 20:29:17 +02:00
Robert Schilling 2cb7bf713e Rtrim input before checking if form is empty 2014-08-04 10:06:53 +02:00
Robert Schilling 010ba5ec22 Remove duplicated setupNoteForm method 2014-08-04 09:55:57 +02:00
Dmitriy Zaporozhets b72ce57da6 Merge branch 'fix-high-cpu-in-ff' of https://gitlab.com/federkasten/gitlab-ce into federkasten/gitlab-ce-fix-high-cpu-in-ff 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-07-28 22:55:57 +03:00
Dmitriy Zaporozhets 420ba2119b Move star button to sidebar. Add counter to forks too 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-24 22:14:12 +03:00
Dmitriy Zaporozhets e21ca9f8b1 Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosantilli-star 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-07-24 10:54:42 +03:00
Jacob Vosmaer 5093c800a7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-07-21 16:34:27 +02:00
GitLab 824821b4e9 Fixing an issue where pages with multiple dropzones can trigger multiple file upload dialogs under certain conditions. 2014-07-17 21:33:21 +00:00
Ciro Santilli ecd771ccdf Move coffee to assets/project 2014-07-17 22:47:16 +02:00
Dmitriy Zaporozhets a74b66cdee Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/group.rb
	app/models/project.rb
	features/steps/shared/project.rb
 2014-07-10 23:43:42 +03:00
Ali Tavakoli 0b1cf50060 Added .closest() to find Reply button on click; fixes #401 
This is to fix the issue where the icon-comment icon is clicked in the
Reply button of a note; the icon is used as the target and incorrectly
assumed to be the button itself, which causes the reply form to spawn
inside the button.
 2014-07-09 18:16:24 -04:00
Dmitriy Zaporozhets 437cccf9a9 Update highlight.js to 8.1 
Also added support for less common languages. All languages from
http://highlightjs.org/download/ now supported

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-09 09:47:06 +03:00
Takashi AOKI 1057251150 fix high cpu usage issue that occured in Firefox 
fixes issue related with #342 (Merge Request view causes 100% CPU in firefox)
 2014-07-02 12:57:30 +09:00
Sytse Sijbrandij 2f962a40e8 Merge pull request #7170 from cirosantilli/add-trailing-newlines 
[minor-refactor] Add trailing newline to all text files.
 2014-06-30 09:41:06 +02:00
Dmitriy Zaporozhets e64343d6e1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/views/layouts/devise.html.haml
	features/project/project.feature
	features/steps/project/project.rb
 2014-06-26 13:02:08 +03:00
Dmitriy Zaporozhets 674cbe1534 Fix diff comments toggle button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 11:40:33 +03:00