Commit Graph
8955 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 26053c8705 Add autocomplete controller 2015-03-26 19:06:19 -07:00
Dmitriy Zaporozhets dfb4fcb685 No magic numbers for issues filtering 2015-03-26 18:56:42 -07:00
Phil Hughes 81ff63d684 Changes the width of sidebar in issues and MRs when affix event fires 2015-03-26 21:23:31 +00:00
Phil Hughes 91b108192c Fork/Star button re-design 2015-03-26 19:38:20 +00:00
Dmitriy Zaporozhets 090f2344ec Merge branch 'set-default-url-options' into 'master'
Set Application controller default URL options to ensure all url_for calls are consistent

### What does this MR do?

This MR sets the app controller's `default_url_options` so that all `url_for` calls are consistent.

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

Setting these options may simplify `url_for` calls that load the GitLab options already. I did not want to touch existing code yet. I'm also not sure if there are other options that need to be included.

### Why was this MR needed?

If you run GitLab behind a reverse proxy or in a Docker container, you don't want a user to be seeing the local IP and port on which GitLab is running (e.g. 192.168.1.1:8080). Right now there are places where this internal data is leaked (e.g. see the URL in Profile Settings -> Account -> Username; this uses `user_url`).

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

#1249

See merge request !453
2015-03-26 18:27:49 +00:00
Dmitriy Zaporozhets a94f8a3c5e Merge branch 'fix-emailsonpush' into 'master'
Fix EmailsOnPush.

See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2185.

See merge request !459
2015-03-26 18:25:19 +00:00
Dmitriy Zaporozhets b8164321fe Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-26 08:56:00 -07:00
Dmitriy Zaporozhets ff23209aec Merge pull request #9029 from tsigo/rs-project-admin
Add archived status to Admin > Project page
2015-03-26 08:55:22 -07:00
Dmitriy Zaporozhets a9cfff256d Merge pull request #9034 from buildkite/rename-buildbox-to-buildkite
Renamed Buildbox to Buildkite.
2015-03-26 08:54:48 -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
Keith Pitt 7fdc017650 Renamed Buildbox to Buildkite. 2015-03-26 11:40:43 +00:00
Hannes Rosenögger 3302888cec Merge branch 'fix-side-by-side-diff' into 'master'
Fix broken side-by-side diff view on merge request page

### What does this MR do?

This MR fixes the side-by-side diff that was broken in v7.9.0. The "Inline" and "Side-by-Side" buttons are now always rendered with HTML links instead of changing depending on whether the code diff was requested in JSON format.

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

Is there a better way to fix this? The links in JSON format may be desirable if there were a JavaScript hook to handle the buttons, but as far as I can tell there isn't at the moment.

### Why was this MR needed?

The issue is that the code diffs can be generated either by the JavaScript handler or the regular HTML. With the forcing of JSON request format in 27e75344, the JavaScript handler requests the page in JSON format, which it then uses to render the page. However, this has the unintended side effect of requesting that the "Inline" and "Side-by-Side" buttons have references to a JSON-formatted link.

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

#1294

See merge request !460
2015-03-26 10:44:08 +00:00
Stan Hu 546dab6da9 Fix broken side-by-side diff view on merge request page
Closes #1294
2015-03-25 23:39:34 -07:00
Douwe Maan 329db2c5de Fix EmailsOnPush. 2015-03-26 07:38:52 +01:00
Dmitriy Zaporozhets 33d134f093 Fix diff header for discussion 2015-03-25 23:21:13 -07:00
Dmitriy Zaporozhets 366ce781b3 Remove unused doorkeeper layout 2015-03-25 23:16:43 -07:00
Dmitriy Zaporozhets 729f0b2e68 Nicer well 2015-03-25 23:16:01 -07:00
Dmitriy Zaporozhets 0b355aba02 Replace alerts with well where alert is not needed 2015-03-25 23:07:59 -07: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 a1d09190e3 Prevent unnecessary doubling of js events on import pages and user calendar 2015-03-25 21:45:01 -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 b5c032d0ac Merge branch 'notification_on_project_moving' into 'master'
Notification on project moving

Moving of project should respect notification settings

https://dev.gitlab.org/gitlab/gitlabhq/issues/2091

See merge request !452
2015-03-26 01:00:26 +00:00
Dmitriy Zaporozhets 8b7aedad2b Prevent doubling AJAX request with each commit visit via Turbolink 2015-03-25 15:47:31 -07:00
Robert Speicher c31d40e358 Update the "Edit Group" button class on Project Admin page 2015-03-25 17:37:05 -04:00
Robert Speicher 3008096106 Add archived status to Admin > Project page 2015-03-25 17:37:05 -04:00
Stan Hu 8173ef976f Set Application controller default URL options to ensure all url_for calls are consistent
Closes #1249
2015-03-25 12:27:10 -07:00
Dmitriy Zaporozhets 6199da0cb4 Merge pull request #8007 from mr-vinn/markdown-tags
Allow HTML tags in user Markdown input
2015-03-25 10:21:03 -07:00
Valery Sizov c8fb972606 notification on project moving 2015-03-25 18:28:39 +02:00
Dmitriy Zaporozhets f729f60447 Merge branch 'more-rubocop-styles' into 'master'
More rubocop styles

See merge request !449
2015-03-25 15:37:04 +00:00
Dmitriy Zaporozhets 8f3f6e9efb Merge branch 'api-internal-errors' into 'master'
Respond with full GitAccess error if user has project read access.

Should help with debugging #1236.

cc @marin

See merge request !437
2015-03-25 04:16:45 +00:00
Vinnie Okada 057c8c344b Merge branch 'master' into markdown-tags 2015-03-24 20:03:22 -06: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 69454e36f7 Style/RedundantReturn enabled 2015-03-24 18:35:57 -07:00
Dmitriy Zaporozhets 6ec8ff069c Enable more rubocop style checks 2015-03-24 18:28:10 -07:00
Dmitriy Zaporozhets b9372c9997 Merge branch 'milestone_and_labels_links' into 'master'
Milestones and labels can be used even when issues are disabled.

When Issues are disabled for a project Milestones and Labels can still be used for Merge Requests.

See merge request !1739
2015-03-25 01:02:34 +00:00
Dmitriy Zaporozhets 05fcfe6daf Merge branch 'mr-button-color' into 'master'
Change merge request button color based on CI status

Green button looks confusing when CI fails

Screenshots:

![ci-warn](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f8166c9acf35f9d886f37f52f975acfb/ci-warn.png)
![ci-can](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d7319c4c567c42a47d79953191384f96/ci-can.png)

See merge request !448
2015-03-24 23:41:42 +00:00
Dmitriy Zaporozhets 2993e2801a Merge branch 'note-avatar-link' into 'master'
Link note avatar to user.

See merge request !446
2015-03-24 23:40:19 +00:00
Dmitriy Zaporozhets 69ab616b38 Merge branch 'user-subscriptions-dependent' into 'master'
Clean up subscriptions when user is deleted.

cc @vsizov

See merge request !439
2015-03-24 23:35:05 +00:00
Dmitriy Zaporozhets 0d50a65b32 Fix diff header in discussion blocks 2015-03-24 16:27:40 -07:00
Dmitriy Zaporozhets 35ec08a6e2 Change merge request button color based on CI status 2015-03-24 16:13:29 -07:00
Dmitriy Zaporozhets 3a602c8432 Merge pull request #9007 from atomaka/atomaka/feature/broadcast-message-colors
Complete transition to using color_field for selecting colors
2015-03-24 15:27:58 -07:00
Marin Jankovski bbf6019dd8 Milestones and labels can be used even when issues are disabled. 2015-03-24 15:18:27 -07:00
Dmitriy Zaporozhets 533b5721c6 Merge branch 'unset-assignee' into 'master'
Make sure issue assignee is properly reset.

Previously, when the assignee was reset via the sidebar or bulk edit, `assignee_id` was set to `-1` rather than `null`, which caused the two issues shown below:

![Screen_Shot_2015-03-24_at_16.52.13](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3c937795c45031c3c72c124ced866598/Screen_Shot_2015-03-24_at_16.52.13.png)

- A "(deleted)" participant
- An empty selectbox in the sidebar, instead of "Select assignee"

See merge request !443
2015-03-24 21:10:18 +00:00
Dmitriy Zaporozhets b8ad3647ad Merge branch 'fix-nested-tasks' into 'master'
Fix nested task lists

When nesting task list items, the parent item is wrapped in a `<p>` tag.  Update the task list parser to handle these paragraph wrappers.

cc @sytse

See merge request !413
2015-03-24 20:57:35 +00:00
Douwe Maan 1651c0bc44 Link note avatar to user. 2015-03-24 18:16:40 +01:00
Andrew Tomaka 83b5a9ae2b Update help texts and default value setting 2015-03-24 12:27:26 -04:00
Douwe Maan 515e9d51df Make sure issue assignee is properly reset. 2015-03-24 16:52:02 +01:00
Douwe Maan 61e8ca8ce0 Don't leak private group existence by redirecting from namespace controller to group controller. 2015-03-24 15:55:12 +01:00