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
93b2a30c79
Merge branch 'point-to-gitlab-com' into 'master'
...
Point people to the issue tracker on GitLab.com to prevent duplication.
/cc @jeroenvanbaarsen
See merge request !713
2015-05-27 11:43:57 +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.
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
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
> 
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
Marin Jankovski
1dbfecb2bb
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2015-05-27 11:18:10 +02:00
Douwe Maan
29290dbb34
Merge branch 'rs-title-change-note' into 'master'
...
Add a note when an Issue or Merge Request's title changes
> 
Closes #1434
See merge request !717
2015-05-27 08:28:56 +00:00
Robert Speicher
38637e7d08
Change one-character variable name
...
[ci skip]
2015-05-27 03:34:14 -04: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 57c724558Closes #772
See merge request !718
2015-05-27 07:27:03 +00:00
Jeroen van Baarsen
8044b4d278
Merge branch 'master' into 'master'
...
ADD: Note on how to setup dns hostname resolution to installation manual
Hi,
I'm suggesting to add the following note to the installation instructions. It took me some time to figure out why the test failed and why I wasn't able to push. The error messages did not point into the right direction so this might help other people with the same problems.
I hope my english is good enough, if not, please feel free to rephrase anything.
Thank you in advance,
Holger Segnitz
See merge request !236
2015-05-27 07:11:44 +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
Patricio Cano
cf12da0653
Added v7.4.4 and .5 to the CHANGELOG
2015-05-27 01:04:23 +00: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
2c1bf71793
Fix ClosingIssueExtractor specs
2015-05-26 15:55:26 -04:00
Robert Speicher
5a9c5520d9
Make use of to_reference in more specs
2015-05-26 15:49:22 -04:00
Robert Speicher
68f74aa826
Add a note about the commented-out test in Markdown Feature
2015-05-26 15:49:22 -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
94af050117
Use to_reference in reference filter specs
2015-05-26 15:48:32 -04:00
Robert Speicher
91eb346de6
Add invalidate_reference to ReferenceFilterSpecHelper
2015-05-26 15:48:31 -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
9d032cddf5
Correct the ReferenceFilter html/pipeline/filter require
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
ca268b85f6
Use to_reference in Markdown feature spec
2015-05-26 15:48:30 -04:00
Robert Speicher
3b80cf524c
Use to_reference in Mentionable shared examples
2015-05-26 15:48:30 -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
Sytse Sijbrandij
199135e567
Point people to the issue tracker on GitLab.com to prevent duplication.
2015-05-26 11:12:29 -07: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
b6117074cc
Merge pull request #9320 from jvanbaarsen/wiki-extention
...
Use .md as extention for wiki pages
2015-05-26 19:00:43 +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
Marin Jankovski
Douwe Maan
Robert Speicher
Jeroen van Baarsen
Stan Hu
Patricio Cano
Robert Speicher
Robert Schilling
Jonah Bishop
Sytse Sijbrandij
