Commit Graph
990 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9eec0d5436 Merge branch 'accepted-rejected-mrs' into 'master'
Add Accepted and Rejected tabs to MR lists.

Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites.

![Screen_Shot_2015-05-25_at_17.02.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b0bf43aa1b5b9898a1c6b204dbcf669a/Screen_Shot_2015-05-25_at_17.02.31.png)

![Screen_Shot_2015-05-25_at_17.02.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2ac05b1e1dba3b2d1692bd9242078f3a/Screen_Shot_2015-05-25_at_17.02.47.png)

![Screen_Shot_2015-05-25_at_17.03.03](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4c0f0fa869c9130a6af18d80a1c6ebed/Screen_Shot_2015-05-25_at_17.03.03.png)

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201.

See merge request !702
2015-05-27 11:40:36 +00:00
Robert Speicher 38fb6279f9 Simplify cross_project_reference with to_reference 2015-05-26 15:48:31 -04:00
Dmitriy Zaporozhets b5ea355078 Merge branch 'rs-link_to_label' into 'master'
Add link_to_label helper

The primary purpose of this change was to make the actual labels on `Labels#index` clickable.

See merge request !690
2015-05-26 15:09:04 +00:00
Stan Hu 9bcd36396b Refactor permission checks to use can? instead of issues_enabled and merge_requests_enabled 2015-05-25 16:51:04 -07:00
Douwe Maan d25026a512 Add Accepted and Rejected tabs to MR lists. 2015-05-25 17:01:27 +02:00
Stan Hu 7a7ce70169 Use the user list from the target project in a merge request
Closes #1535
2015-05-22 09:52:09 -04:00
Robert Speicher 9bdd7f34a5 Add link_to_label helper 2015-05-21 23:40:25 -04:00
Job van der Voort 3a3f4b41e6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-21 10:38:22 +02:00
Alex ConnorandJeroen van Baarsen 3c892f3554 Disabled expansion of top/bottom blobs for new file diffs 2015-05-21 09:25:07 +02:00
Hannes Rosenögger dfce7b62f7 workaround for buggy lexers
if something goes wrong, fall back to the plaintext lexer
2015-05-20 16:16:27 +02:00
Jakub Jirutka b0659c1b07 Simplify and unify helpers for rendering markup 2015-05-18 22:52:13 +02:00
Jakub Jirutka daa0925016 Rename MarkdownHelper to MarkupHelper 2015-05-18 22:51:56 +02:00
Jakub Jirutka 8dbc4746fe Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263) 2015-05-18 20:48:03 +02:00
Vinnie Okada af428b1259 Fill in email on the new password form 2015-05-16 14:03:18 -06:00
Vinnie Okada 0bfab084a8 Explain reset token expiration in emails
Tell new users when their password reset token expires and provide a
link to get a new one.
2015-05-16 14:03:07 -06:00
Dmitriy Zaporozhets 07fd736d2e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-15 12:59:44 +03:00
Dmitriy Zaporozhets 9c6f4a2351 Merge branch 'dashboard-references' into 'master'
Fix reference links in dashboard activity and ATOM feeds.

References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations.

This MR passes the project in question to the reference parsers in an option.

cc @rspeicher

See merge request !653
2015-05-15 09:59:26 +00:00
Jorge Vasquez dfb58234a1 Fix bug with default timezone en RSS gitlab events 2015-05-14 15:30:55 -04:00
Dmitriy Zaporozhets ded82ed4c9 Small refactoring of state_filters_text_for helper 2015-05-14 18:34:06 +03:00
Dmitriy Zaporozhets 40f381e652 append empty space only if count exists 2015-05-14 18:32:07 +03:00
Dmitriy Zaporozhets 3d4d89f060 Use count badges with number_with_delimiter helper for issue, commit count 2015-05-14 18:30:23 +03:00
Douwe Maan cd52cef1c0 Fix reference links in dashboard activity and ATOM feeds. 2015-05-14 13:05:33 +02:00
Dmitriy Zaporozhets 63403019d2 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-13 14:26:39 +03:00
Dmitriy Zaporozhets f32a045ef4 Merge branch 'version-check' into 'master'
Version check

See merge request !1509
2015-05-13 11:17:16 +00:00
Dmitriy Zaporozhets 740716afd1 Merge pull request #9276 from jirutka/relative_link_filter
Extract handling of relative file links to its own HTML filter
2015-05-13 14:09:57 +03:00
Douwe Maan bfe2384797 Restructure project sidebar. 2015-05-12 10:27:17 +02:00
Douwe Maan f84e78f3d7 Merge branch 'commit_time_timezone' into 'master'
Fix commit time being displayed in the wrong timezone in some cases

This MR makes sure that the displayed commit date is shown in the timezone that's configured in the gitlab.yml.
Before it was possible that the `committed_date` of a commit would display different values on the dashboard and the commit page.

fixes gitlab-org/gitlab-ce#1278

/cc @DouweM

See merge request !624
2015-05-12 07:49:10 +00:00
Dmitriy Zaporozhets 0928c3ae04 Enable version check only for production environment
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-11 18:23:40 +03:00
Jakub Jirutka f7adac87fe Extract handling of relative file links to RelativeLinkFilter 2015-05-11 02:07:26 +02:00
Douwe Maan a3edd473b9 Improve create_mr_button? performance. 2015-05-09 23:51:50 +02:00
Douwe Maan 722e393589 Add Create Merge Request buttons to commits page and push event. 2015-05-09 22:26:52 +02:00
Dmitriy Zaporozhets c3cf32e863 Merge branch 'version-check' into gl-version-check
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/admin/application_settings_controller.rb
	app/views/admin/application_settings/_form.html.haml
	db/schema.rb
2015-05-08 16:05:00 +03:00
Dmitriy Zaporozhets f38ce01bc3 Remove encryption
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-08 15:14:56 +03:00
Dmitriy Zaporozhets 6c32abc5f7 Merge branch 'rs-task_list' into 'master'
Use task_list gem for task lists

Task Lists can now be used in comments, and they'll render in previews. 👏

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271

See merge request !599
2015-05-08 09:39:48 +00:00
Robert Speicher c4aa700398 Merge branch 'rs-fix-filter-tooltips' into 'master'
Fix tooltips for event filter links

See merge request !618
2015-05-07 21:51:51 +00:00
Douwe Maan f5f097b765 Merge branch 'feature/handle-big-diffs' into 'master'
Improve handling of large diffs

Diffs with a large number of changed lines time out (504 HTTP error) or
generate a HTML page that's so heavy web browsers struggle with it.

https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on
commit line count so that only a safe portion is rendered. This was
later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab.
This patch re-introduces a safe limit on number of lines.

See merge request !539
2015-05-07 19:29:55 +00:00
Hannes Rosenögger 2a3c1d7cdd Fix commit time being displayed in the wrong timezone in some cases 2015-05-07 18:18:23 +02:00
Robert Speicher 725ff58bc8 Don't add js-task-list-container to things the user can't edit 2015-05-06 13:00:13 -04:00
Robert Speicher 5ed7a39dc7 Fix tooltips for event filter links 2015-05-06 12:25:23 -04:00
Dmitriy Zaporozhets 22d5e9855c When use change branches link at MR form - save source branch selection instead of target one
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-06 15:13:11 +03:00
Alex Lossent affd049dc4 Improve handling of large diffs
Diffs with a large number of changed lines time out (504 HTTP error) or
generate a HTML page that's so heavy web browsers struggle with it.

https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on
commit line count so that only a safe portion is rendered. This was
later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab.
This patch re-introduces a safe limit on number of lines.
2015-05-05 18:51:12 +02:00
Dmitriy Zaporozhets 16db51ec58 Merge branch 'fix-wiki-search' into 'master'
Fix Error 500 when searching Wiki pages

If a Wiki page turns up a hit in the search results, an error will occur:

```
Completed 500 Internal Server Error in 836ms

NoMethodError - undefined method `slug' for "test.markdown":String:
  app/helpers/wiki_helper.rb:10:in `namespace_project_wiki_path'
  app/views/search/results/_wiki_blob.html.haml:4:in `_app_views_search_results__wiki_blob_html_haml___2752621660395393333_70299911622700'
  actionview (4.1.9) lib/action_view/template.rb:145:in `block in render'
  activesupport (4.1.9) lib/active_support/notifications.rb:161:in `instrument'
  actionview (4.1.9) lib/action_view/template.rb:339:in `instrument'
  actionview (4.1.9) lib/action_view/template.rb:143:in `render'
```

An unhandled String containing the name of the Wiki page would be provided to the URL path generator. This MR handles that case.

Closes #1547

See merge request !592
2015-05-04 08:53:21 +00:00
Robert Schilling 78da7b1c48 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-03 15:00:58 +02:00
Robert Schilling 5f3eef6e56 Add period at snippet visibilty description 2015-05-03 15:00:46 +02:00
Dmitriy Zaporozhets e097812f57 Merge pull request #9234 from dsander/group-milestones-by-title
Group milestones by title in the dashboard and all other issue views
2015-05-03 14:29:31 +03:00
Dmitriy Zaporozhets cfbff017d0 Merge branch 'you-get-a-title-and-you-get-a-title-and-everyone-gets-a-title' into 'master'
Add a page title to every page.

![You get a title, and you get a title; everyone gets a title!](https://i.imgflip.com/kvmq8.jpg)

The `page_title` helper pushes the provided string at the end of the title, but because of the order that layouts are rendered in by ActionView, the result is always this:

```
<title from view> |
<title from as specified in the controller or by its layout> |
<title from layouts/_head>
```

For example: `Merge Requests | GitLab.org / Gitlab Community Edition | GitLab`.

All a developer needs to know is to put a `page_title` call describing the page in question at the start of every template.

To get everything where I wanted it to go without too much duplication, I had to make some changes around layouts, sidebars and controllers.

See merge request !593
2015-05-02 07:34:58 +00: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
Dominik Sander e6ee8d0ebe Group milestones by title in the dashboard and all other issue views
This groups milestones by title for issue views like it has been done for
the milestone dashboard/project overview. Before milestones with the
same title would show up multiple times in the filter dropdown and one could
only filter per project and milestone. Now the milestone filter is based
on the title of the milestone, i.e. all issues marked with the same
milestone title are shown.
2015-05-01 01:12:58 +02:00
Robert Speicher 84a7675ea6 Remove title_for_issue helper 2015-04-30 17:27:33 -04:00
Robert Speicher e46d1cdd8b Add Gitlab::Markdown::SanitizationFilter
This just extends the HTML::Pipeline::SanitizationFilter with our custom
whitelist.
2015-04-30 16:35:25 -04:00