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
Dmitriy Zaporozhets
8b9e3af8bf
Merge branch 'ad-block_auto_created_users' into 'master'
...
Don't accidentally unblock auto created users from Active Directory.
Fixes #1581 .
See merge request !638
2015-05-12 13:28:33 +00:00
Dmitriy Zaporozhets
ff13fb0ab5
Merge branch 'brakeman-level'
...
Conflicts:
lib/tasks/brakeman.rake
2015-05-12 13:21:11 +03:00
Douwe Maan
125cb9b866
Don't accidentally unblock auto created users from Active Directory.
2015-05-12 11:26:43 +02:00
Jacob Vosmaer
cae978a9e8
We would like to pass 'brakeman -w2'
2015-05-11 18:11:09 +02:00
Jacob Vosmaer
0a47d8f3f4
Follow shell command guidelines in Brakeman task
...
There is no real issue here because the shell command is completely
static, but it is still nicer to just follow the guidelines in
doc/development/shell_commands.md .
2015-05-11 11:11:03 +02:00
Robert Speicher
70bbf093aa
Remove class and id attributes from SanitizationFilter whitelist
2015-05-08 12:31:34 -04:00
Valeriy Sizov
f682a6adb9
Merge pull request #9214 from Bugagazavr/hook-events
...
Added X-GitLab-Event header for web hooks
2015-05-08 17:17:01 +03:00
bugagazavr
acac788902
Added X-GitLab-Event header for web hooks
2015-05-08 16:49:03 +03: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
Dmitriy Zaporozhets
5b8712e4c2
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-05-08 12:26:58 +03: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
0a99e6e2fa
Remove 'jasmine' gem
...
jasmine-rails still requires it as a dependency, but for some reason
running `rake jasmine:ci` produced test failures but
`rake spec:javascript` didn't.
2015-05-06 15:31:24 -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
Dmitriy Zaporozhets
317ed1fa90
Revert "Allow to configure smtp and sendmail in gitlab.yml"
2015-05-06 17:39:18 +03:00
Jakub Jirutka
b4be7aed77
Allow to configure smtp and sendmail in gitlab.yml
2015-05-06 13:15:33 +02: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
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
Robert Speicher
Dmitriy Zaporozhets
Douwe Maan
Jacob Vosmaer
Valeriy Sizov
bugagazavr
Jakub Jirutka
quodos
Sven Selberg
Onur Küçük
jubianchi
Stan Hu
Jeroen van Baarsen
