Douwe Maan
2bb2ade50d
Merge branch 'master' into license
...
# Conflicts:
# db/schema.rb
2015-05-05 13:03:33 +02:00
Douwe Maan
68ac20604b
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee
...
# Conflicts:
# app/controllers/groups/application_controller.rb
# app/services/test_hook_service.rb
# app/views/admin/groups/show.html.haml
# app/views/groups/_settings_nav.html.haml
# app/views/groups/show.html.haml
# app/views/layouts/_head.html.haml
# app/views/projects/_settings_nav.html.haml
# db/schema.rb
# features/project/project.feature
# features/steps/project/project.rb
2015-05-05 10:18:27 +02:00
quodos
b953796ac8
Update authentication.rb
...
correct spelling
2015-05-04 14:09:03 +02:00
Sven Selberg
361284fec2
Add current_sign_in_at to api User
2015-05-04 09:42:11 +02:00
Dmitriy Zaporozhets
747232eeda
Merge branch 'api-iid' of https://github.com/jubianchi/gitlabhq into jubianchi-api-iid
2015-05-03 14:34:23 +03:00
Dmitriy Zaporozhets
a7ddff8748
Merge pull request #9066 from jirutka/fix-6417
...
Fix #6417 : users with group permission should be able to create groups via API
2015-05-03 14:31:00 +03:00
Dmitriy Zaporozhets
644b4c97e9
Merge pull request #8756 from zaburt/force_utf8_on_oauth_properties
...
add common method to force utf8 and force oauth properties to be utf8
2015-05-03 14:25:36 +03:00
Onur Küçük
0ae574007d
add common method to force utf8 and force oauth properties to be utf8
2015-05-03 00:43:46 +03:00
jubianchi
2c544d43c8
Query issues, merge requests and milestones with their IID through API
2015-05-02 10:44:52 +02:00
Douwe Maan
d1f2b09fad
Allow license to be uploaded and enforce its validity.
2015-05-01 14:52:30 +02:00
Robert Speicher
84a7675ea6
Remove title_for_issue helper
2015-04-30 17:27:33 -04:00
Robert Speicher
242bebc134
Remove special handling for the ' problem
...
While `escape_once` will create this HTML entity, Nokogiri always
translates it back before it gets to IssueReferenceFilter, so there
should be no danger of erroneous issue links.
2015-04-30 16:35:27 -04:00
Robert Speicher
0027c2ddd7
Add Project#get_issue
2015-04-30 16:35:27 -04:00
Robert Speicher
466bec7caa
Rename SCHEME_PATTERN to LINK_PATTERN
2015-04-30 16:35:27 -04:00
Robert Speicher
cd3c24a8f3
Autolink short URLs
2015-04-30 16:35:27 -04:00
Robert Speicher
50f707e27a
Update Autolink SCHEME_PATTERN
2015-04-30 16:35:26 -04:00
Robert Speicher
9ec8a5f75d
Doc typo
2015-04-30 16:35:26 -04:00
Robert Speicher
421edd3545
Escape normal text in our Redcarpet renderer
2015-04-30 16:35:26 -04:00
Robert Speicher
588267b5e2
Update the Gitlab::Markdown docs
2015-04-30 16:35:26 -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
Robert Speicher
aa2cc670fe
Add Gitlab::Markdown::AutolinkFilter
2015-04-30 16:35:25 -04:00
Robert Speicher
382a0aa6ef
Add Gitlab::Markdown::TableOfContentsFilter
...
Removes header and table of contents processing from Redcarpet renderer.
2015-04-30 16:35:25 -04:00
Douwe Maan
f2cf6d75ec
Merge branch 'show-invalid-projects-google-code-import' into 'master'
...
Show incompatible projects in Google Code import status
Using Google Code import with a JSON file that contained only one Subversion project led to confusion
over whether the system was working. Display the list of valid projects if there are any, and show a list of incompatible projects. Provide tips on how to retain issue data after conversion.
Closes #1531
## Screenshots
Before:
After with no projects available (notice the button is hidden):
After with 1 valid and 1 incompatible project:
See merge request !586
2015-04-30 17:08:45 +00:00
Stan Hu
9c76a6fa96
Show incompatible projects in Google Code import status
...
Importing a JSON file with only one Subversion project lead to confusion
over whether the system was working. Provide status why these projects
could not be imported directly.
Closes #1531
2015-04-30 06:56:49 -07:00
Douwe Maan
7e0eb486ed
Don't allow a merge request to be merged when its title starts with "WIP".
2015-04-30 15:46:36 +02:00
Jeroen van Baarsen
285cf3f772
Merge pull request #8677 from jubianchi/api-500-json
...
Send 500 errors as JSON in the API
2015-04-28 18:03:34 +02:00
jubianchi
3070b2cfc7
Add a rake task to automatically restart foreman when changes occur
2015-04-27 21:32:41 +02:00
Robert Speicher
2cca78b175
Add external issues to ReferenceExtractor
2015-04-27 15:28:03 -04:00
jubianchi
79d0b69345
Send 500 errors as JSON in the API
2015-04-27 21:27:02 +02:00
Robert Speicher
b41fe91ece
Add result to ExternalIssueReferenceFilter
2015-04-27 15:25:44 -04:00
Jeroen van Baarsen
fbb5a359fe
Merge pull request #8754 from jirutka/fix-project_name_regex
...
Fix (project_)name_regex to accept non-ASCII letters and dash
2015-04-27 17:48:14 +02:00
Jakub Jirutka
a1c01bc19b
Fix (project_)name_regex to accept non-ASCII letters and dash
2015-04-27 16:38:47 +02:00
Valery Sizov
bc9ba5237c
Revert "Added X-GitLab-Event header for web hooks"
...
This reverts commit 548f182814
2015-04-27 16:29:31 +03:00
Dmitriy Zaporozhets
2e243fc321
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
README.md
VERSION
app/controllers/projects/services_controller.rb
app/controllers/projects/uploads_controller.rb
app/services/test_hook_service.rb
db/schema.rb
features/steps/admin/settings.rb
lib/gitlab/reference_extractor.rb
spec/models/note_spec.rb
2015-04-27 11:53:31 +03:00
Dmitriy Zaporozhets
278c3ba401
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-04-27 11:38:36 +03:00
Dmitriy Zaporozhets
38e2ae5ae0
Merge pull request #8644 from Bugagazavr/hook-events
...
Add X-GitLab-Event header for web hooks
2015-04-27 11:22:33 +03:00
Dmitriy Zaporozhets
7ee1d68e0d
Merge pull request #9186 from Senorsen/patch-1
...
Fix contributions calendar empty problem under mysql
2015-04-27 11:20:24 +03:00
Dmitriy Zaporozhets
b4317b1656
Merge branch 'fix-gitorious-importer' into 'master'
...
Get Gitorious importer to work again.
Fixes #1504 .
See merge request !576
2015-04-27 07:42:32 +00:00
Dmitriy Zaporozhets
6de7f94f00
Merge branch 'rs-minor-styles' into 'master'
...
Minor design change grab-bag 🎉
I started with one simple change and found a few more, so here they are.
### Simplify icon style selectors
All FontAwesome icons have an `fa` class, so just use that.
### Don't override color of code blocks in notes
This was a pet peeve of mine.
| Before | After |
|:------:|:-----:|
|  |  |
### Items with tooltips don't need a 'data-original-title' attribute
This attribute gets added dynamically by Bootstrap's tooltip JS based on the `title` attribute
### Fix Profile > Design live-updating
`ui_blue` wasn't added to the list of classes to remove, so if a user changed to that theme, any subsequent changes wouldn't be live-updated.
This change refactors Gitlab::Theme a bit to make it harder for this to happen in the future with new themes.
### Remove the `has_bottom_tooltip` class
Bootstrap's tooltip JS can read the placement from a `data-placement` attribute.
Further, when we supply the `selector` option to `tooltip`, tooltips will be added to any dynamically-added elements matching the selector, without us having to re-call the `tooltip` method.
See merge request !569
2015-04-27 07:36:42 +00:00
Robert Speicher
a64b5e3c60
Convert UserReferenceFilter#link_to_group to use a guard clause
2015-04-25 21:26:43 -04:00
Robert Speicher
92783eae2b
Refactor UserReferenceFilter#user_link_filter
2015-04-25 18:07:20 -04:00
Robert Speicher
9d3a1d0054
Fix docs for push_result
...
[ci skip]
2015-04-25 17:44:24 -04:00
Robert Speicher
07a88040a4
Fix NotificationService spec
2015-04-25 16:46:06 -04:00
Robert Speicher
95ca6584d8
Add CommitRange directly to results Hash
2015-04-25 14:46:06 -04:00
Robert Speicher
2207e5a6c9
DRY up ReferenceExtractor
2015-04-25 14:41:07 -04:00
Robert Speicher
c0a97d70ef
Don't allow nil references to get added to results
2015-04-25 14:41:06 -04:00
Robert Speicher
6bac823ad4
Update CommitRangeReferenceFilter to use CommitRange class
...
Also matches CommitReferenceFilter's new behavior of always using short
SHAs in the link text.
2015-04-25 14:41:06 -04:00
Robert Speicher
2c8bfedb20
Always use short SHAs as commit reference link text
...
Now when a user pastes a full SHA like
`d7f61affaf845f44b4cc995e34eb1606c47c8eff`, its link text will only show
`d7f61aff` for brevity.
2015-04-25 14:40:40 -04:00
Robert Speicher
8f8a8ab32b
Refactor ReferenceExtractor to use pipeline filters
2015-04-25 14:40:12 -04:00
Robert Speicher
a6defd1576
Add results to reference filters
2015-04-25 14:39:45 -04:00
Douwe Maan
quodos
Sven Selberg
Dmitriy Zaporozhets
Onur Küçük
jubianchi
Robert Speicher
Stan Hu
Jeroen van Baarsen
Jakub Jirutka
Valery Sizov
