Commit Graph
711 Commits
Author SHA1 Message Date
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
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 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 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
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
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 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
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 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
Douwe Maan 3102454a56 Don't show Unassigned in user select when searching. 2015-03-03 13:52:13 +01: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