home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,261 Commits 48 Branches 340 Tags
b46ce7b0eeaff95c94cef6dc87e8a79819649949
Commit Graph
756 Commits
Author SHA1 Message Date
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
Douwe Maan 224187ffb9 Move group members index from /members to /group_members. 2015-03-15 13:51:11 +01:00
Douwe Maan 31fc73f0a9 Use project_member instead of team_member. 2015-03-15 13:50:38 +01:00
Dmitriy Zaporozhets 80b2f3fb86 Implement merge requests search 
It is same search like we have at issues page. It allows to quickly
filter merge requests based on title or desription. I copy-pasted some
js code from Issues.js. In future search (filtering) logic should be
refactoed into one class for merge requests and issues
 2015-03-12 16:20:58 -07:00
Dmitriy Zaporozhets dd78cd1ce4 Style improvements to import page 2015-03-12 10:04:09 -07:00
Dmitriy Zaporozhets be4d340381 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb
 2015-03-11 18:41:41 -07:00
Dmitriy Zaporozhets 04c674e679 Cleanup after removing group tab from dashboard aside 2015-03-10 13:27:58 -07:00
Dmitriy Zaporozhets 1178dacdb6 Fix line highlight being hidden by header 2015-03-10 10:50:53 -07:00
Dmitriy Zaporozhets d36ee3190a Add starred projects page to dashboard 2015-03-09 14:12:03 -07:00
Dmitriy Zaporozhets c025c0d589 Merge branch 'webstorage-exception' into 'master' 
Properly handle autosave local storage exceptions.

Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1182.

See merge request !1643
 2015-03-08 23:43:40 +00:00
Dmitriy Zaporozhets cec2be2d76 Merge branch 'fix-milestone-list-width' into 'master' 
Fix width of text in milestone lists and add assignee icon to merge requests.

Before:

![Screen_Shot_2015-03-06_at_13.48.00](https://dev.gitlab.org/gitlab/gitlabhq/uploads/5754638a3ebb79dee1f6c07a6e268035/Screen_Shot_2015-03-06_at_13.48.00.png)

After:

![Screen_Shot_2015-03-06_at_13.48.14](https://dev.gitlab.org/gitlab/gitlabhq/uploads/fe92adf387964efb3d460dfc61ced3b8/Screen_Shot_2015-03-06_at_13.48.14.png)

I've checked with other screen widths as well, and it looks good all the time.

See merge request !1645
 2015-03-08 23:41:26 +00:00
Douwe Maan bf02072a86 Properly handle autosave local storage exceptions. 2015-03-07 11:27:39 +01:00
Robert Schilling 0f66b32965 Merge branch 'master' into 'master' 
Fix editor in IE producing errors #1096

IE seems to handle form submission oddly. It gets fired twice - once from javascript and once from the form click, producing 2 identical requests and causing #1096.

Similar issues: http://stackoverflow.com/questions/14373800

Returning false from the click event seems to fix it and shouldn't cause any side-effects.

See merge request !366
 2015-03-07 08:00:57 +00:00
Douwe Maan be94e13552 Add assignee icon to milestone merge requests. 2015-03-06 14:08:40 +01:00
Dmitriy Zaporozhets 8b53d9efe6 Fix bug with active tab remembering (saving cookie with different path) 2015-03-06 01:41:47 -08:00
Dmitriy Zaporozhets 65105ff3bb Improve projects list 
* Add search filtering for group projects
* Show all user projects on dashboard
* Refactor projects list into one view
* Hide big list of projects with 'Show all' button
 2015-03-04 17:22:55 -08:00
unknown 6fd0600685 Bugfix #1096 2015-03-04 22:05:15 +02:00
Marin Jankovski 8be36a2c0f Merge branch 'autosave-new-issuables' into 'master' 
Autosave title and description of new issues/MRs.

Closes #2048.

See merge request !1595
 2015-03-04 06:38:55 +00:00
Dmitriy Zaporozhets 811505c7ce Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/views/groups/members.html.haml
 2015-03-03 13:33:40 -08:00
Douwe Maan 3102454a56 Don't show Unassigned in user select when searching. 2015-03-03 13:52:13 +01:00
Dmitriy Zaporozhets 8dcffdcdc1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb
 2015-03-02 16:10:12 -08:00
Dmitriy Zaporozhets 27e7534470 Merge pull request #8829 from ZeoAlliance/merge_request_diff_view_fix 
[bugfix] Merge request diff view behaviour fix
 2015-03-02 14:28:21 -08:00
Dmitriy Zaporozhets faae454424 Merge pull request #8869 from tsigo/rs-issue-867 
Allow mass-unassigning of issues
 2015-02-26 09:04:23 -08:00
Dmitriy Zaporozhets 7fef8456e8 Merge branch 'small-fixes' into 'master' 
Small fixes

Fixes #2062 and #2061

See merge request !1601
 2015-02-26 06:31:50 +00:00
Dmitriy Zaporozhets e27f5aef46 Fix sticky diff header 2015-02-25 22:17:46 -08:00
Robert Speicher e53dd7526f Allow mass-unassigning of issues 
Fixes #867

[ci skip]
 2015-02-25 23:57:23 -05:00
Dmitriy Zaporozhets c254cb03d8 Fix affix for issue and merge request with image in description 2015-02-25 20:00:28 -08:00
Douwe Maan 87da9185ff Autosave title and description of new issues/MRs. 2015-02-25 12:52:37 +01:00
Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload 
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
 2015-02-24 14:54:39 +01:00
Dmitriy Zaporozhets 976e18bb33 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre 
Conflicts:
	app/views/groups/show.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
 2015-02-23 23:56:59 -08:00
Dmitriy Zaporozhets 93447c4b14 Merge pull request #8760 from yglukhov/diff-sticky-headers 
Diff headers made sticky
 2015-02-23 23:50:07 -08:00
Dmitriy Zaporozhets 8601c502e8 Merge branch 'fix-commit-zen-mode' into 'master' 
Fix ZenMode on commit show and milestone edit pages.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1110

See merge request !1557
 2015-02-24 02:02:44 +00:00
Dmitriy Zaporozhets 87b04868a1 Create Aside js class for handling all sidebars in UI for mobile devices 2015-02-21 22:01:27 -08:00
Douwe Maan aba1251594 Merge branch 'master' into extend_markdown_upload 2015-02-21 13:46:58 +01:00
Douwe Maan 198d75b3a8 Initialize ZenMode on commit show and milestone edit pages. 2015-02-21 11:13:31 +01:00
Dmitriy Zaporozhets b2fb6e0e0c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/services/merge_requests/build_service.rb
	app/views/layouts/_head.html.haml
 2015-02-20 16:02:25 -08:00
Douwe Maan 218283b368 Merge branch 'extend_markdown_upload' into generic-uploads 
# Conflicts:
#	app/controllers/files_controller.rb
#	app/controllers/projects/uploads_controller.rb
#	app/uploaders/attachment_uploader.rb
 2015-02-20 15:37:37 +01:00