home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,693 Commits 48 Branches 340 Tags
1deccc561d814cb7dfe7e4e5476c66bf3cec423d
Commit Graph
792 Commits
Author SHA1 Message Date
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
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
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
Dmitriy Zaporozhets 40c3675372 Merge branch 'clear-note-form-on-succcess' into 'master' 
Prevent note form from being cleared when submitting failed.

When you try to submit a comment while you're not connected to the internet or while your connection is having trouble, the AJAX request would fail and the note would be deleted 😢

See merge request !468
 2015-03-29 10:58:34 +00:00
Dmitriy Zaporozhets 0a634f3481 Merge pull request #9040 from tsigo/rs-refactor-nav-collapse 
Refactor sidebar JS logic
 2015-03-29 03:36:28 -07:00
Robert Speicher 65c4dc19f7 Simplify toggle-nav-collapse JS 2015-03-27 15:16:20 -04:00
Douwe Maan 7a70fb123c Prevent holding Control-Enter or Command-Enter from posting comment multiple times. 2015-03-27 16:55:18 +01:00
Douwe Maan 351e61f4b2 Prevent note form from being cleared when submitting failed. 2015-03-27 12:52:07 +01:00
Dmitriy Zaporozhets d6c8eefb5d Big refactoring of issues filters 
* Squash project users selectbox and users selectbox into one class
* Move from API autocomplete to GitLab internal one
* Smarter filter for project/group/all issues
* Use selectbox with searchbox for assignee/author/milestone/label
* Switch to ajax filter for issue author/assignee
 2015-03-26 19:13:49 -07:00
Dmitriy Zaporozhets 1c2711f7e3 Refactor UsersSelect to use internal gitlab autocomplete controller 2015-03-26 19:13:38 -07:00
Dmitriy Zaporozhets 7842a81569 Merge branch 'capitalize-js-class' into 'master' 
Capitalize js class name

See merge request !457
 2015-03-26 15:40:34 +00:00
Dmitriy Zaporozhets 3a11165648 Improve protected branches page UX 2015-03-25 22:45:58 -07:00
Dmitriy Zaporozhets 429a43ca6a Dont bind all checkboxes when you need only protected branches 2015-03-25 22:32:08 -07:00
Dmitriy Zaporozhets 80fd8f2de1 Capitalize js class name 2015-03-25 22:22:10 -07:00
Dmitriy Zaporozhets 12430b65d4 Merge branch 'fix-compare-diff-unfold' into 'master' 
Fix code unfold not working on Compare commits page

### What does this MR do?

The code unfold buttons (`...`) don't work when you go to Commits -> Compare mode. This MR fixes that.

### Are there points in the code the reviewer needs to double check?

Check to make sure all the right initializers are run in the `projects:compare:xxx` case. I'm also not sure if there are other cases where a diff is shown but the code unfolding is not activated.

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

Closes #1274

See merge request !434
 2015-03-26 01:17:35 +00:00
Dmitriy Zaporozhets 3840549566 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/assets/javascripts/dispatcher.js.coffee
	features/admin/settings.feature
	features/steps/admin/settings.rb
	features/steps/user.rb
	features/user.feature
	lib/gitlab/git_access.rb
 2015-03-25 09:16:09 -07:00
Dmitriy Zaporozhets f2ea9d9f3f Improve sticky headers in diffs 
* disable sticky headers in discussion
* enable sticky header on mr page with you click changes tab
 2015-03-24 19:00:00 -07:00
Dmitriy Zaporozhets 35ec08a6e2 Change merge request button color based on CI status 2015-03-24 16:13:29 -07:00
Douwe Maan 515e9d51df Make sure issue assignee is properly reset. 2015-03-24 16:52:02 +01:00
Stan Hu eecd897170 Fix code unfold not working on Compare commits page 
Closes #1274
 2015-03-24 00:19:41 -07:00
Dmitriy Zaporozhets c5d65ed62f Merge branch 'userpage-activity-scroll' 
Conflicts:
	app/controllers/users_controller.rb
 2015-03-23 09:45:40 -07:00
Dmitriy Zaporozhets 9968250211 Add inifinite scroll to user activity on user page 2015-03-22 15:40:26 -07:00
Dmitriy Zaporozhets 8494170550 Improve contribution calendar per day info 2015-03-22 14:52:44 -07:00
Dmitriy Zaporozhets 64891c6c40 Replace commits calendar with contributions calendar 
* count opening of issues and merge requests
* dont trigger git repository - use events from database
* much-much faster since does not affected by repository size
 2015-03-21 23:48:08 -07:00
Dmitriy Zaporozhets c0a7f8763e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/helpers/merge_requests_helper.rb
 2015-03-20 15:51:47 -07:00
Dmitriy Zaporozhets b0e2441330 Improve issue sidebar position 2015-03-20 15:33:13 -07:00
Dmitriy Zaporozhets 1f711fd93d Remove upvotes js logic since it does not work as expected anyway 2015-03-20 12:34:21 -07:00
Dmitriy Zaporozhets 31af3f4003 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	spec/models/note_spec.rb
 2015-03-19 23:21:50 -07:00
Valery Sizov 19032c0319 add canceled CI status 2015-03-19 18:27:24 +02:00
Dmitriy Zaporozhets e0f8e022f7 Improve comment toggle button in diff 2015-03-18 17:53:43 -07:00
Dmitriy Zaporozhets aec8c717a1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	Gemfile
	VERSION
	app/models/service.rb
 2015-03-18 10:33:31 -07:00
Douwe Maan 1f21dfaeab Merge branch 'commit_calendar_activity' into 'master' 
Extend commit calendar to actually show what commits were made on a date

## What does this MR do?
This MR extends the commit calendar so it acutally shows what commits were made on a date and in which project.
It is based on the optimizations @dzaporozhets made for the calendar.

## Are there points in the code the reviewer needs to double check?
The UI and how the links are generated i guess. That feels hacky at the moment :/

## Screenshot:
![commit_calendar_extend_display](https://gitlab.com/uploads/gitlab-org/gitlab-ce/5bf1631660/commit_calendar_extend_display.png)

I assume that i have to refactor this a bit more to make it a cleaner implementation, so please give me feedback on what needs to be changed :)

See merge request !326
 2015-03-18 13:05:07 +00:00
Hannes Rosenögger 120f032b1a enable line wrapping by default and remove the checkbox to change it 2015-03-18 08:46:53 +01:00
Hannes Rosenögger 9e5738b007 Extend the commit calendar to show the actual commits for a date 2015-03-18 08:42:42 +01:00
Dmitriy Zaporozhets 635f18debd Merge branch 'ce-to-ee' into 'master' 
CE to EE

See merge request !353
 2015-03-17 19:10:14 +00:00
Dmitriy Zaporozhets b35d7e5578 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	db/schema.rb
 2015-03-17 10:19:31 -07:00
Dmitriy Zaporozhets 5059c66045 Merge branch 'share-with-different-group' into 'master' 
Don't allow project to be shared with the group it is already in.

Fixes #249.

See merge request !352
 2015-03-17 17:17:26 +00:00
Dmitriy Zaporozhets 9162e34bb0 Merge branch 'issue_subscription' into 'master' 
Subscription to issue/mr

Fixes #1911 and #1909

![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png)

![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png)

See merge request !1702
 2015-03-17 16:45:04 +00:00
Valery Sizov 22fcb2f418 improve UI 2015-03-17 17:11:57 +02:00
Douwe Maan ed6803498b Don't allow project to be shared with the group it is already in. 2015-03-17 14:04:04 +01:00
Dmitriy Zaporozhets d3361e6d1b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/application_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/team_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/helpers/projects_helper.rb
	app/helpers/tab_helper.rb
	app/models/application_setting.rb
	app/models/user.rb
	app/views/devise/shared/_signin_box.html.haml
	app/views/groups/projects.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/projects/team_members/_form.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
	db/schema.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2015-03-16 21:25:00 -07:00
Valery Sizov 1b437ec349 tests 2015-03-16 21:38:41 +02:00
Valery Sizov 9698b36c1c Subscription 2015-03-15 19:44:59 +02:00
Douwe Maan 5ad35bbe02 Use same layout and interactivity for project members as group members. 2015-03-15 13:55:57 +01:00