home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,172 Commits 48 Branches 340 Tags
37e2fb81c212e4079bd1e79082ce1302002de467
Commit Graph
468 Commits
Author SHA1 Message Date
Marin Jankovski 95ef8f9756 Merge remote-tracking branch 'ce/master' 
Conflicts:
	VERSION
	doc/install/installation.md
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	lib/gitlab/markdown.rb
	spec/lib/gitlab/ldap/ldap_access_spec.rb
 2014-05-21 13:10:37 +02:00
Marin Jankovski 7478ece8b4 Add template for merge request descriptions to projects. 2014-05-14 15:24:14 +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 556ca35274 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/application.scss
	app/views/layouts/devise.html.haml
 2014-05-12 12:39:51 +03: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
Dmitriy Zaporozhets 4f8308178c Render appearance changes. Show appearance tab in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-14 22:14:50 +03:00
Dmitriy Zaporozhets 89eabd305e Remove application.js 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-10 13:59:08 +03:00
Dmitriy Zaporozhets fae2e540b6 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile.lock
	README.md
	VERSION
	app/assets/javascripts/application.js
	db/schema.rb
	doc/install/installation.md
	doc/update/4.2-to-5.0.md
	doc/update/5.0-to-5.1.md
	doc/update/5.1-to-5.2.md
	doc/update/5.2-to-5.3.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.0-to-6.7.md
	lib/gitlab/git_access.rb
 2014-04-10 13:34:56 +03:00
Thomas MoschnyandMarin Jankovski 5b123dbf7f Fix avatars in the network graph for relative-url setups. 2014-04-10 10:05:40 +02:00
Marin Jankovski cf616a845b Do not require modernizr. 
Conflicts:
	app/assets/javascripts/main.js.coffee
 2014-04-09 09:46:17 +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 3fa2dd1107 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-6-7-rc 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile.lock
	VERSION
	lib/gitlab/git_access.rb
 2014-03-21 12:22:43 +02: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 e502d785f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb
 2014-03-18 11:15:01 +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 cf413ffb75 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce_6_6 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	VERSION
	db/schema.rb
	features/steps/group/group.rb
	lib/api/internal.rb
 2014-02-19 14:55:07 +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 903726c846 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
 2014-02-11 10:15:13 +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 2df9a76042 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/generic/common.scss
	app/views/projects/edit.html.haml
	config.ru
	db/schema.rb
	doc/install/installation.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/gitlab/upgrader.rb
 2014-01-21 18:15:49 +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