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
Dmitriy Zaporozhets
740dc41250
Merge branch 'project_api_order' into 'master'
...
Add order option for projects API
https://dev.gitlab.org/gitlab/gitlab-ci/issues/222
See merge request !656
2015-05-14 20:25:39 +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
Dmitriy Zaporozhets
c2ee828c19
Merge branch 'omniauth-csrf' into 'master'
...
Protect OmniAuth request phase against CSRF.
Addresses #2268 .
See merge request !1793
2015-05-14 14:22:26 +00:00
Valery Sizov
7c3ca86370
Add order option for projects API
2015-05-14 15:49:09 +03: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
63403019d2
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-05-13 14:26:39 +03:00
Dmitriy Zaporozhets
f32a045ef4
Merge branch 'version-check' into 'master'
...
Version check
See merge request !1509
2015-05-13 11:17:16 +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
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
Jakub Jirutka
b3276661f7
RelativeLinkFilter: refactor according to suggestions by @tsigo
2015-05-11 20:43:18 +02:00
Jacob Vosmaer
cae978a9e8
We would like to pass 'brakeman -w2'
2015-05-11 18:11:09 +02:00
Dmitriy Zaporozhets
b3f5c679b6
Replace host with real one
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-05-11 18:21:45 +03: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
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
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
c3cf32e863
Merge branch 'version-check' into gl-version-check
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
app/controllers/admin/application_settings_controller.rb
app/views/admin/application_settings/_form.html.haml
db/schema.rb
2015-05-08 16:05:00 +03:00
Dmitriy Zaporozhets
edf0a0715b
Remove unnecessary public key
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-05-08 15:59:34 +03:00
Dmitriy Zaporozhets
f38ce01bc3
Remove encryption
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-05-08 15:14:56 +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
Robert Speicher
Dmitriy Zaporozhets
Valery Sizov
Douwe Maan
Jacob Vosmaer
Jakub Jirutka
bugagazavr
quodos
Sven Selberg
