home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,820 Commits 48 Branches 340 Tags
b2d45bb5440f3c028900f013ca2656ff2f46b913
Commit Graph
834 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets b2d45bb544 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb
 2015-05-13 14:10:14 +03:00
Dmitriy Zaporozhets 15bbb4ee1a Merge pull request #9244 from dreis2211/firefox_issuable_filter_patch 
Fix Firefox problems when it wants to render issuable component
 2015-05-08 22:24:51 +03:00
Robert Speicher d5ee54df16 More JS dependency requirements 2015-05-06 15:31:08 -04:00
Robert Speicher c96c7cbfb1 Make issue JS require its dependencies 2015-05-06 13:00:14 -04:00
Robert Speicher 968c281f40 Make notes JS require its dependencies 2015-05-06 13:00:14 -04:00
Robert Speicher ce29e5cd8f Update task list behavior for Merge Requests 2015-05-06 12:58:27 -04:00
Robert Speicher 922497560e Update task list behavior for Notes 2015-05-06 12:58:27 -04:00
Robert Speicher a3d55db910 Update task list behavior for Issues 2015-05-06 12:58:27 -04:00
Robert Speicher 18baf550e1 Add task_list JS 2015-05-06 12:58:27 -04:00
Robert Speicher 5ef8bd33d0 Remove taskable.js 2015-05-06 12:58:27 -04:00
dreis a1152e19d1 Fix Firefox problems when it wants to render issuable component 2015-05-05 21:52:06 +02:00
Douwe Maan 2bb2ade50d Merge branch 'master' into license 
# Conflicts:
#	db/schema.rb
 2015-05-05 13:03:33 +02:00
Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb
 2015-05-05 10:18:27 +02:00
Douwe Maan d1f2b09fad Allow license to be uploaded and enforce its validity. 2015-05-01 14:52:30 +02:00
Douwe Maan 92fd3ccee0 Add helpers for header title and sidebar, and move setting those from controllers to layouts. 2015-05-01 10:39:16 +02:00
Dmitriy Zaporozhets 2e243fc321 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	README.md
	VERSION
	app/controllers/projects/services_controller.rb
	app/controllers/projects/uploads_controller.rb
	app/services/test_hook_service.rb
	db/schema.rb
	features/steps/admin/settings.rb
	lib/gitlab/reference_extractor.rb
	spec/models/note_spec.rb
 2015-04-27 11:53:31 +03:00
Robert Speicher 1e1785cc16 Place the logo's tooltip dynamically 
When collapsed it's on the right like everything else, when expanded
it's on the bottom.
 2015-04-25 16:03:18 -04:00
Robert Speicher d30ceda7de Add collapsed navbar links to the default tooltip selector 2015-04-25 16:00:30 -04:00
Robert Speicher e8faf9178a Remove the has_bottom_tooltip class 
Bootstrap's tooltip JS can read the placement from a `data-placement`
attribute.

Further, when we supply the `selector` option to `tooltip`, tooltips
will be added to any dynamically-added elements matching the selector,
without us having to re-call the `tooltip` method.
 2015-04-25 14:03:40 -04:00
Dmitriy Zaporozhets f502b293e5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
	spec/helpers/gitlab_markdown_helper_spec.rb
 2015-04-24 11:22:54 +03:00
Robert Speicher 85bbb91476 Fix GfmAutoComplete for jquery-atwho 1.0 2015-04-23 13:08:16 -04:00
Dmitriy Zaporozhets 71f6143552 Merge branch 'master' into new-sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/snippets_controller.rb
 2015-04-23 12:08:03 +03:00
Dmitriy Zaporozhets a22f3139f3 Merge branch 'rs-reply-hotkey' into 'master' 
"Reply quoting selected text" shortcut/hotkey

Adds the <kbd>r</kbd> hotkey for quoting selected text on Issuable forms.

This MR also updates the jasmine gem and adds jasmine-rails to let us use the asset pipeline (and Coffeescript) in JS specs.

See merge request !1775
 2015-04-22 19:57:40 +00:00
Dmitriy Zaporozhets 4860c4dc07 Fix toggle of sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-22 16:48:39 +03:00
Douwe Maan 2400181a3a Merge branch 'fix-cannot-move-project-error' into 'master' 
Fix "Cannot move project" error message from popping up after a successful transfer

The JavaScript click handlers were never being removed, leading to duplicate requests when attempting to transfer a project to another namespace. The first transfer would succeed but the subsequent ones would fail, leading to the error message saying, "Cannot move project".

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/0c9f61294291514e0c2a48c204b6a1aa/image.png)

I attempted to write a unit test for this, but it was taking me too long to get it right.

Closes #1448 and #1128

See merge request !548
 2015-04-21 09:29:17 +00:00
Stan Hu 6fb1e80a26 Fix "Cannot move project" error message from popping up after a successful project transfer 
Multiple event handlers were firing, causing multiple form submissions.

Closes #1448 and #1128
 2015-04-20 12:46:02 -07:00
Dmitriy Zaporozhets 5b10796235 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/project.rb
	db/schema.rb
 2015-04-20 19:19:27 +03:00
Leo Antunes f2a817f040 do not prepend relative_url_root to avatar 
The commit.author.icon variable contains a full URL, which gets broken
when prepended by the relative_url_root setting (generating hrefs like
"/gitlabhttps://...".
 2015-04-20 09:52:03 +02:00
Robert Speicher 4d1878253e Typo: Issueable -> Issuable 2015-04-18 15:20:15 -04:00
Robert Speicher 8e6fa2555e Add JS specs for replyWithSelectedText 2015-04-18 15:17:26 -04:00
Robert Speicher ca5d0c8250 Add hotkey for "reply with selected text" to Issueable 2015-04-18 15:17:26 -04:00
Robert Speicher 662bdfbeb1 Make StatGraph JS explicitly require its dependencies 
This allows us to test them in a bit more isolation.
 2015-04-18 15:17:25 -04:00
Robert Speicher 7d5fefb780 Fix 'merge_reuests' typo 2015-04-18 15:17:24 -04:00
Robert Speicher 269aee790c Let Bootstrap's tab JS handle history 
Closes #2219
 2015-04-17 16:42:38 -04:00
Dmitry Medvinsky 92544df8da Fix auto-selection of URL field with X11 selection 
We use `focusin` event instead of `click` because when using the latter,
when the selection is created it isn't put into X11 PRIMARY selection.
And as a Linux user I'm very used to such behaviour that when something
gets selected, it's ready for pasting, which is the primary purpose of
the clone URL field.

When `focusin` is used, the selection is copied to X11 buffer
automatically, so it works as expected (tested in Firefox and Chrome).
 2015-04-17 10:16:18 +03:00
Dmitriy Zaporozhets d01d0c02b7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/deploy_keys_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_team.rb
	app/models/service.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/admin/groups/show.html.haml
	app/views/groups/group_members/_new_group_member.html.haml
	config/initializers/1_settings.rb
	db/schema.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/reference_extractor_spec.rb
 2015-04-15 19:22:57 +03:00
Dmitriy Zaporozhets ef8d96e5de Merge branch 'ce-to-ee-2' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	app/assets/javascripts/dispatcher.js.coffee
	app/controllers/help_controller.rb
	app/models/user.rb
	app/views/groups/group_members/_new_group_member.html.haml
	config/gitlab.yml.example
	config/routes.rb
	features/groups.feature
	features/steps/dashboard/help.rb
 2015-04-14 15:08:19 +03:00
Douwe Maan 87dd3f215f Let members be invited from Add members pane. 2015-04-14 12:08:10 +02:00
Dmitriy Zaporozhets 9311f86291 Merge branch 'temp-ce-ee' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/javascripts/api.js.coffee
	app/assets/javascripts/users_select.js.coffee
 2015-04-14 13:05:39 +03:00
Stan Hu 3d2c387840 Move current user to the top of the list in author/assignee filters 
Closes #1321
 2015-04-09 01:04:53 -07:00
Robert Speicher f7190e428f Typo -- findAndollowLink -> findAndFollowLink 2015-04-07 11:03:48 -04:00
Drew Blessing aedc12547a Merge branch 'issue-sidebar-size' into 'master' 
Changes the width of sidebar in issues and MRs when affix event fires

Fixes #1320

Width is set when Bootstraps affix event is fired and then removed when it reaches the top or bottom.

See merge request !464
 2015-04-03 13:23:11 +00:00
Stan Hu dfd256f29e Support configurable attachment size via Application Settings 
Fix bug where error messages from Dropzone would not be displayed on the issues page

Closes #1258
 2015-04-02 00:04:08 -07:00
Dmitriy Zaporozhets c14c03a88f Merge branch 'rs-issue-1340' into 'master' 
Unbind task item checkbox events and then rebind them

Fixes #1340

This issue was caused by this line: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/views/projects/issues/update.js.haml#L17

`new Issue()` gets called on every JS-based issue update, and all the binds in the constructor get re-applied without first unbinding the existing ones. Right now my fix is *only* for the checkbox events, and I suspect there are similar issues still present for other events.

See merge request !478
 2015-04-01 01:33:03 +00:00
Dmitriy Zaporozhets 0622b87537 Merge branch 'admin-user-projects' into 'master' 
Fix admin user projects lists.

The admin user personal projects lists wasn't being rendered anymore.

cc @marin

See merge request !442
 2015-04-01 00:44:09 +00:00
Robert Speicher 085f12288d Unbind task item checkbox events and then rebind them 
Fixes #1340
 2015-03-31 17:45:11 -04:00
Douwe Maan 2d5f4458a0 Fix admin user projects lists. 2015-03-31 09:19:08 +02:00
Dmitriy Zaporozhets 0191857fac Better legend for contribution calendar pt2 :) 2015-03-31 05:57:36 +03:00
Dmitriy Zaporozhets 549e6c100b Better legend for contribution calendar 2015-03-31 05:50:10 +03:00
Dmitriy Zaporozhets 38dd6bcaae Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-29 17:23:09 -07:00