Commit Graph
8955 Commits
Author SHA1 Message Date
Douwe Maan b222f211c1 Merge branch 'browse-milestone-issues' into 'master'
Fix milestone "Browse Issues" button.

After refactoring around issue/merge requests filters, the button stopped working :(

See merge request !699
2015-05-27 15:31:52 +00:00
Douwe Maan e46849c454 Merge branch 'fix-disabled-project-snippet-feature' into 'master'
Fix project snippets button appearing when it is disabled

There was a typo in 9bcd36396b that caused the project snippets option to be shown when it is disabled.

Closes #1705

See merge request !720
2015-05-27 15:31:22 +00:00
Alex Lossent 22de5443c5 Add SAML support via Omniauth 2015-05-27 16:38:10 +02:00
Steve Norman 10871732df Use entity number for plus sign 2015-05-27 13:04:18 +00:00
Douwe Maan 97f9d601cc Merge branch 'fix-safari-clone-url' into 'master'
Fix clone URL losing selection after a single click in Safari and Chrome

### What does this MR do?

This MR deactivates the mouseup event in the `git clone` URL to prevent the text from being deselected after a single click.

### Why was this MR needed?

In Safari and Chrome 43.0.2357.65 (42.0.2311.152 worked fine), the URL would lose selection after a single click. To reproduce:

1. Go to https://gitlab.com/gitlab-org/gitlab-ce
2. Click on the URL in the repository (HTTP is selected by default).
3. Click on the SSH button.
4. Click on the URL again.

The URL selection should be selected automatically, but it is deselected immediately.

It appears that 92544df changed the selection event from `click` to `focusin` to make copy & paste work in X11. This Stack Overflow article discusses the deselection issue in detail:

http://stackoverflow.com/questions/3380458/looking-for-a-better-workaround-to-chrome-select-on-focus-bug

### What are the relevant issue numbers?

Closes https://github.com/gitlabhq/gitlabhq/issues/9326

See merge request !698
2015-05-27 12:26:41 +00:00
Douwe Maan 7a11ef3e95 Add Browse Issues button to Dashboard and Group milestones. 2015-05-27 14:23:04 +02:00
Douwe Maan 511791014e Fix milestone "Browse Issues" button. 2015-05-27 14:23:04 +02:00
Douwe Maan 45e4727f97 Set milestone on new issue when creating issue from index with milestone filter active. 2015-05-27 14:22:11 +02:00
Douwe Maan 106cb511de Merge branch 'support-file-attachments-milestones' into 'master'
Add file attachment support in Milestone description

### What does this MR do?

This MR adds support for attaching files to Milestone descriptions.

### Why was this MR needed?

Dropzone support should be in every Markdown area. It seems that this one was overlooked.

### What are the relevant issue numbers?

Closes #1648

See merge request !712
2015-05-27 12:17:34 +00:00
Stan Hu ab88b7da19 Fix project snippets button appearing when it is disabled
Closes #1705
2015-05-27 05:07:44 -07:00
Dmitriy Zaporozhets 4146ce559e Merge branch 'profile-in-sidebar' into 'master'
Move user avatar and logout button to sidebar

Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2272

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !719
2015-05-27 11:52:53 +00:00
Dmitriy Zaporozhets fcc0ff2ccd Merge branch 'nav-settings' into 'master'
Clarify navigation labels for Project Settings and Group Settings.

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

See merge request !703
2015-05-27 11:48:33 +00:00
Dmitriy Zaporozhets 2cd1cee639 Merge branch 'commit-graphs-by-email' into 'master'
Group project contributions by both name and email.

See https://twitter.com/Argorain/status/598751646143897600.

We now group by both name and email, so that "Douwe Maan - douwe@gitlab.com", "Douwe Maan - me@douwe.me" and "Douwe M. - me@douwe.me" are all combined into one graph.

Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2328.

See merge request !700
2015-05-27 11:45:53 +00:00
Dmitriy Zaporozhets 464123b388 Merge branch 'emailsonpush-prefix' into 'master'
Prefix EmailsOnPush email subject with `[Git]`.

Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2112.

See merge request !701
2015-05-27 11:45:14 +00:00
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
Dmitriy Zaporozhets 56ab471f98 Move user avatar and logout button to sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-27 13:17:14 +02:00
Dmitriy Zaporozhets 701c2e9a3b Merge branch 'rs-to_reference' into 'master'
Add to_reference method to referable models

Now there is a single source of information for which attribute a model uses to be referenced, and its special character.

See merge request !641
2015-05-27 10:03:14 +00:00
Dmitriy Zaporozhets 3ed05b2191 Merge branch 'rs-manual-2fa-entry' into 'master'
Add support for manually entering 2FA details

> ![Screen_Shot_2015-05-22_at_6.39.26_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/27b6cc0b2f88e0ccec234dd8d20db957/Screen_Shot_2015-05-22_at_6.39.26_PM.png)

Related to #1679 though I'm not sure if it entirely fixes it, since I don't have access to a Windows Phone.

See merge request !694
2015-05-27 09:53:40 +00:00
Douwe Maan 29290dbb34 Merge branch 'rs-title-change-note' into 'master'
Add a note when an Issue or Merge Request's title changes

> ![Screen_Shot_2015-05-26_at_9.40.19_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f05c6a7b9f489ce66560cfe724184ec9/Screen_Shot_2015-05-26_at_9.40.19_PM.png)

Closes #1434

See merge request !717
2015-05-27 08:28:56 +00:00
Douwe Maan 62d0ce19ed Merge branch 'fix-hipchat-default-api-version' into 'master'
Allow HipChat API version to be blank and default to v2

### What does this MR do?

This MR fixes a regression introduced in v7.11 that requires a HipChat API version to be specified when it is supposed to be optional.

### Why was this MR needed?

The "optional" HipChat API version in 57c724558 passed in a blank `api_version` when nothing was specified, and the code was not tested. This would cause a 500 Error.

### What are the relevant issue numbers?

Closes #772

See merge request !718
2015-05-27 07:27:03 +00:00
Stan Hu 0c9463174b Allow HipChat API version to be blank and default to v2
Closes #772
2015-05-26 21:57:24 -07:00
Robert Speicher 1aa3921dd8 Add a note when an Issue or Merge Request's title changes 2015-05-26 21:49:04 -04:00
Robert Speicher cc0f223858 Merge branch 'fix-typo-in-email' into 'master'
Fix "Asignee" typo in new issue/merge request emails

See merge request !676
2015-05-26 21:47:04 +00:00
Robert Speicher 3cb6a33846 More SystemNoteService cleanup 2015-05-26 16:30:07 -04:00
Robert Speicher 1a9da9178c Surround Project.reference_pattern in parenthesis inside other patterns 2015-05-26 15:49:22 -04:00
Robert Speicher 5cc9b17b8a Make cross_project_reference? less magical 2015-05-26 15:49:21 -04:00
Robert Speicher 81a09bc74c Support only double quotes for multi-word label references 2015-05-26 15:49:20 -04:00
Robert Speicher 35853033b9 Fix for Snippets with a project 2015-05-26 15:48:32 -04:00
Robert Speicher 1a277c5025 Minor documentation updates 2015-05-26 15:48:32 -04:00
Robert Speicher b88da58cb6 Add reference_pattern to Referable models 2015-05-26 15:48:32 -04:00
Robert Speicher 136ab73803 Update CommitRange#to_reference to use full SHAs
We only want them shortened by the filter, which calls to_s
2015-05-26 15:48:31 -04:00
Robert Speicher 0359d41b06 Implement gfm_reference directly in Mentionable
Except for Note, which still overrides it.
2015-05-26 15:48:31 -04:00
Robert Speicher 38fb6279f9 Simplify cross_project_reference with to_reference 2015-05-26 15:48:31 -04:00
Robert Speicher 8773f339a3 Minor model spec cleanups
Snippet model was missing project association
2015-05-26 15:48:30 -04:00
Robert Speicher c0faf91ff2 Add to_reference for models that support references
Now there is a single source of information for which attribute a model
uses to be referenced, and its special character.
2015-05-26 15:48:30 -04:00
Robert Speicher b06dc74d61 Add Referable concern 2015-05-26 15:48:30 -04:00
Robert Speicher 38cd3d6451 Add Commit#==
Prior, comparison would use the Ruby object's ID, which got out of sync
after a Spring fork and would result in erroneous test failures.

Now we just check that the compared object is a Commit and then compare
their underlying raw commit objects.
2015-05-26 15:48:29 -04:00
Robert Schilling 0ec1e4c028 Merge branch 'milestoneRescue' into 'master'
Change percent_complete rescue value from 100 to 0

The percent_complete method returns a value of 100 when a
ZeroDivisionError occurs. That seems like a very strange default for an
error case, and results in a bug when a milestone has no corresponding
issues (new, empty milestones show 100% completion). This commit changes
the rescue value to 0, and subsequently fixes #1656, which reported this
problem.

See merge request !714
2015-05-26 19:12:27 +00:00
Jonah Bishop 8b92946b54 Change percent_complete rescue value from 100 to 0
The percent_complete method returns a value of 100 when a
ZeroDivisionError occurs. That seems like a very strange default for an
error case, and results in a bug when a milestone has no corresponding
issues (new, empty milestones show 100% completion). This commit changes
the rescue value to 0, and subsequently fixes #1656, which reported this
problem.
2015-05-26 14:57:53 -04:00
Dmitriy Zaporozhets f955554d0f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-26 20:32:55 +02:00
Dmitriy Zaporozhets a94dc7319c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-05-26 20:32:23 +02:00
Dmitriy Zaporozhets b11bcb8a74 Use default control for search field in header
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-05-26 20:32:11 +02:00
Jeroen van Baarsen aa36a19613 Merge pull request #9319 from jvanbaarsen/validate-wiki-page-creation
Validate wiki page creation
2015-05-26 20:05:25 +02:00
Robert Schilling 5c2acc51e2 Merge branch 'fix-escape-key-in-zen-mode' into 'master'
Fix Zen Mode not closing with ESC key

### What does this MR do?

This MR fixes the ESC key not leaving Zen Mode (fullscreen).

### Why was this MR needed?

This has been broken since GitLab v7.8. The `change` event for `zen-toggle-comment` was never fired. See:

http://stackoverflow.com/questions/19505011/checkbox-checked-with-prop-does-not-fire-events-attached-to-change?answertab=votes#tab-top

### What are the relevant issue numbers?

* Closes #1025
* Closes https://github.com/gitlabhq/gitlabhq/issues/9018

See merge request !710
2015-05-26 17:26:28 +00:00
Dmitriy Zaporozhets f815094e6d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-26 19:08:03 +02:00
Jeroen van Baarsen b16aad9dd1 Validate wiki page creation
**What does this do?**
It adds validation to the creation of a wiki page, that way the user gets real
feedback instead of just a 404 page if the name of the wiki page was invalid

**Why is this needed?**
There are a lot of characters that are not allowed in the creation of a wiki
page, there is even a small text that is saying: Please don't use spaces.
Although we have that text there, we don't actually validate on this. This
commit adds validation on the title and gives the user actual feedback.

**What issues does this fix?**
Fixes http://github.com/gitlabhq/gitlabhq/issues/5357
Fixes https://github.com/gitlabhq/gitlabhq/issues/8565
Fixes https://github.com/gitlabhq/gitlabhq/issues/3913
Fixes https://github.com/gitlabhq/gitlabhq/issues/8166

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-05-26 19:01:11 +02:00
Jeroen van Baarsen fa2aee5048 Use .md as extention for wiki pages
**What does this do?**
It makes sure that when you create a wiki page via the web interface, the
extention is .md instead of .markdown

**Why is this needed?**
When you're using Gollum locally, it will create pages with the .md extention.
Also .md is the best known extention for markdown. This fix will make sure that
if you're using gollum or the webinterface, the extention will be the same.

**What issues does this fix?**
Fixes https://github.com/gitlabhq/gitlabhq/issues/5204

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-05-26 18:12:46 +02: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
Dmitriy Zaporozhets 8ea443b6d6 Merge branch 'fix-fullscreen-preview-in-milestones' into 'master'
Fix Markdown preview not working in Edit Milestone page

### What does this MR do?

This MR removes the automatic Zen Mode URL update when a hash is present and makes Markdown preview work again in the Edit Milestone page. I think the intent was to make it possible to link to a full-screen edit with a URL (e.g. http://foo/bar/issues/1/edit#fullscreen), but I don't this has ever worked. Perhaps a future MR can support this.

### Why was this MR needed?

A JavaScript error would be seen in the Milestone Edit page:

```javascript
Uncaught error, unrecognized expression: $('.zennable input[type=checkbox]##md-preview-holder')
```

In the Milestone Edit page, apparently the use of the hash `#md-preview-holder` causes the Zen Mode JavaScript to attempt to parse the hash for the `fullscreen_` prefix and look up the checkbox based on a unknown ID.

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

If we want to keep this hash update, an alternative fix is to add an `if` check in the beginning of `checkboxFromLocationHash`:

```coffeescript
if (window.location.hash.indexOf('#' + ZenMode.fullscreen_prefix) == -1)
  return null
```

### What are the relevant issue numbers?

* Closes #1687
* Closes https://github.com/gitlabhq/gitlabhq/issues/9325

See merge request !711
2015-05-26 14:15:17 +00:00
Stan Hu 8c3c5afba2 Add file attachment support in Milestone description
Closes #1648
2015-05-25 21:41:47 -07:00