Jacob Vosmaer
7aadea6520
What sort of LDAP queries does GitLab EE make?
2015-05-27 15:41:23 +02:00
Marin Jankovski
c490430f55
Fix leftover user checks for git_annex after refactoring
2015-05-22 14:46:44 +02:00
Dmitriy Zaporozhets
1af8b1e4f8
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Conflicts:
app/views/help/index.html.haml
lib/gitlab/git_access.rb
public/500.html
public/502.html
2015-05-15 13:29:58 +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
Robert Speicher
0ad9fc60ec
Enable 2FA for LDAP logins
2015-05-14 14:45:31 -04:00
Dmitriy Zaporozhets
947231a461
Merge branch 'rs-relative-link-filter' into 'master'
...
Minor RelativeLinkFilter cleanup
See merge request !649
2015-05-14 14:37:43 +00:00
Douwe Maan
cd52cef1c0
Fix reference links in dashboard activity and ATOM feeds.
2015-05-14 13:05:33 +02:00
Robert Speicher
7f2fb72a0a
Minor RelativeLinkFilter cleanup
2015-05-13 14:08:37 -04:00
Jacob Vosmaer
c291ff9c6f
Use SIGKILL by default in Sidekiq::MemoryKiller
...
This makes the memory growth-triggered Sidekiq restarts more reliable by
reducing the chance that Sidekiq ends up in a state where it is not
accepting new jobs but also not shutting down: SIGKILL is more likely to
work than SIGTERM.
2015-05-13 17:09:12 +02:00
Dmitriy Zaporozhets
8ad91d5840
Merge branch 'text-batch-1' into 'master'
...
Batch 1 of text improvements
Batch 1 of changes from my effort at !635 to walk through every piece of text in GitLab and see if it can be improved.
This batch includes:
- Improve text on error pages.
- Improve Git access error messages.
- Improve description of branch protection levels.
- Improve OAuth signup error message.
- Improve OAuth application flash messages.
cc @rspeicher
See merge request !642
2015-05-13 12:05:17 +00: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
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
c5e4b443ff
Fix GitAccess.
2015-05-13 09:46:22 +02:00
Douwe Maan
17a41547a0
Improve OAuth signup error message.
2015-05-13 09:41:56 +02:00
Douwe Maan
9eb45ccd55
Improve description of branch protection levels.
2015-05-13 09:41:55 +02:00
Douwe Maan
1f72c387c9
Improve Git access error messages.
2015-05-13 09:41:55 +02:00
Douwe Maan
125cb9b866
Don't accidentally unblock auto created users from Active Directory.
2015-05-12 11:26:43 +02:00
Jakub Jirutka
b3276661f7
RelativeLinkFilter: refactor according to suggestions by @tsigo
2015-05-11 20:43:18 +02:00
Jakub Jirutka
f7adac87fe
Extract handling of relative file links to RelativeLinkFilter
2015-05-11 02:07:26 +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
Jacob Vosmaer
Marin Jankovski
Dmitriy Zaporozhets
Robert Speicher
Douwe Maan
Jakub Jirutka
quodos
Onur Küçük
Stan Hu
