Robert Speicher
0ad9fc60ec
Enable 2FA for LDAP logins
2015-05-14 14:45:31 -04:00
Dmitriy Zaporozhets
b2d45bb544
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Conflicts:
app/controllers/uploads_controller.rb
app/helpers/application_helper.rb
app/models/note.rb
app/services/test_hook_service.rb
db/schema.rb
spec/models/note_spec.rb
2015-05-13 14:10:14 +03:00
Douwe Maan
125cb9b866
Don't accidentally unblock auto created users from Active Directory.
2015-05-12 11:26:43 +02:00
Robert Speicher
70bbf093aa
Remove class and id attributes from SanitizationFilter whitelist
2015-05-08 12:31:34 -04: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
Douwe Maan
fbb011be38
Merge branch 'license' into 'master'
...
Allow license to be uploaded and enforce its validity.
Addresses #274 .
Still a work in progress, there are no tests yet, some things need extra validation or prettier error messages, and we're not doing anything to enforce active user count yet. Still, the flow stands! Let me know what you think :)
- [x] Check active user count at moment of upload
- [x] Prettier validation / error message when license is invalid
- [x] Prettier error when public key is invalid
- [x] Tests
- [x] Work on copy
These will go into separate MRs as they require more discussion:
- Check historic active user count over past year
- Add application setting to disallow creating/activating new user when limit is reached
-----
No license:
Also shown when pushing code:
The "Upload a new license in the admin area" part is only for admins, regular users will see "Ask an admin to upload a new license".
Upload page in admin area:
License details in admin area:
Notice of a license that will expire: Also notice the license history at the bottom.
Notice of an expired license:
cc @dzaporozhets @sytse
See merge request !383
2015-05-07 18:54:47 +00:00
Jacob Vosmaer
1c1f18b416
Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env var
...
It looks like SIGTERM may not be enough to shut down a Sidekiq process
when its RSS has gotten too big. This change will allow us to experiment
with sending SIGKILL instead of SIGTERM to Sidekiq processes on
gitlab.com.
2015-05-07 18:47:03 +02:00
Robert Speicher
cca28c7920
Update Markdown help docs for latest changes
2015-05-06 21:04:33 -04:00
Robert Speicher
6883e6e084
Remove all references to parse_tasks
2015-05-06 12:58:28 -04:00
Robert Speicher
61c73575c3
Add TaskList::Filter to pipeline
2015-05-06 12:58:27 -04:00
Douwe Maan
359c039b6e
Fix Git access check.
2015-05-05 16:27:21 +02:00
Douwe Maan
4dfaed34b2
Skip git hooks commit validation when pushing new tag.
2015-05-05 15:44:36 +02:00
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
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
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
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
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
Robert Speicher
2cca78b175
Add external issues to ReferenceExtractor
2015-04-27 15:28:03 -04:00
Robert Speicher
b41fe91ece
Add result to ExternalIssueReferenceFilter
2015-04-27 15:25:44 -04:00
Jakub Jirutka
a1c01bc19b
Fix (project_)name_regex to accept non-ASCII letters and dash
2015-04-27 16:38:47 +02: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
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
Robert Speicher
879be42862
Initialize the references result Hash in ReferenceFilter
2015-04-25 14:39:44 -04:00
Robert Speicher
Dmitriy Zaporozhets
Douwe Maan
Jacob Vosmaer
quodos
Onur Küçük
Stan Hu
Jakub Jirutka
